diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/sourcelookup/DsfSourceDisplayAdapter.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/sourcelookup/DsfSourceDisplayAdapter.java
index 316395382a5..428a4c854af 100644
--- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/sourcelookup/DsfSourceDisplayAdapter.java
+++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/sourcelookup/DsfSourceDisplayAdapter.java
@@ -795,7 +795,7 @@ public class DsfSourceDisplayAdapter implements ISourceDisplay, ISteppingControl
     @DsfServiceEventHandler
     public void eventDispatched(final IRunControl.ISuspendedDMEvent e) {
 		updateStepTiming();
-    	if (e.getReason() == StateChangeReason.STEP) {
+    	if (e.getReason() == StateChangeReason.STEP || e.getReason() == StateChangeReason.BREAKPOINT) {
 	        // trigger source display immediately (should be optional?)
 	        Display.getDefault().asyncExec(new Runnable() {
 				public void run() {
@@ -808,6 +808,8 @@ public class DsfSourceDisplayAdapter implements ISourceDisplay, ISteppingControl
 				        }
 			        }
 				}});
+    	} else {
+    		doneStepping(e.getDMContext());
     	}
     }