diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java
index 2f208c9671b..0f81f254096 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java
@@ -1807,7 +1807,7 @@ public abstract class DisassemblyPart extends WorkbenchPart implements IDisassem
 						frame= 0;
 					}
 					if (frame != fTargetFrame) {
-						gotoFrameIfActive(frame);
+						gotoFrame(frame);
 					}
 				}
 			}
@@ -2089,6 +2089,9 @@ public abstract class DisassemblyPart extends WorkbenchPart implements IDisassem
 		assert isGuiThread();
 		if (fActive) {
 			gotoFrame(frame);
+		} else {
+            // this will trigger an update in #setActive()
+		    fTargetFrame = -1;
 		}
 	}