diff --git a/idea/testData/debugger/tinyApp/outs/stopInInlineCallInFieldInDelegate.out b/idea/testData/debugger/tinyApp/outs/stopInInlineCallInFieldInDelegate.out
new file mode 100644
index 00000000000..fcdb980757b
--- /dev/null
+++ b/idea/testData/debugger/tinyApp/outs/stopInInlineCallInFieldInDelegate.out
@@ -0,0 +1,8 @@
+LineBreakpoint created at stopInInlineCallInFieldInDelegate.kt:11
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stopInInlineCallInFieldInDelegate.StopInInlineCallInFieldInDelegateKt
+Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+stopInInlineCallInFieldInDelegate.kt:11
+stopInInlineCallInFieldInDelegate.kt:12
+Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+
+Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInInlineCallInFieldInDelegate.kt b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInInlineCallInFieldInDelegate.kt
new file mode 100644
index 00000000000..8cdc8a69299
--- /dev/null
+++ b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInInlineCallInFieldInDelegate.kt
@@ -0,0 +1,30 @@
+package stopInInlineCallInFieldInDelegate
+
+import kotlin.reflect.KProperty
+
+class A {
+    var value = 42
+
+    val b: String by getDelegate {
+        {
+            //Breakpoint!
+            foo(value)
+        }()
+    }
+}
+
+@Suppress("NOTHING_TO_INLINE")
+inline fun getDelegate(function: () -> Unit): Delegate {
+    function()
+    return Delegate()
+}
+
+class Delegate() {
+    operator fun getValue(a: A, property: KProperty<*>): String = ""
+}
+
+fun foo(a: Any) {}
+
+fun main(args: Array<String>) {
+    A().b
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinSteppingTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinSteppingTestGenerated.java
index 845fc04f8a7..670e9c36de1 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinSteppingTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinSteppingTestGenerated.java
@@ -740,6 +740,12 @@ public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest {
             doStepOverTest(fileName);
         }
 
+        @TestMetadata("stopInInlineCallInFieldInDelegate.kt")
+        public void testStopInInlineCallInFieldInDelegate() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInInlineCallInFieldInDelegate.kt");
+            doStepOverTest(fileName);
+        }
+
         @TestMetadata("stopInInlineCallInFieldInLocalClass.kt")
         public void testStopInInlineCallInFieldInLocalClass() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInInlineCallInFieldInLocalClass.kt");