diff --git a/ide/debugmanager.pas b/ide/debugmanager.pas
index 15ec47a6d2..eb687c2221 100644
--- a/ide/debugmanager.pas
+++ b/ide/debugmanager.pas
@@ -1699,7 +1699,7 @@ begin
   Editor := nil;
   if SourceEditorManager <> nil
   then begin
-    Editor := SourceEditorManager.GetActiveSE;
+    Editor := SourceEditorManager.SourceEditorIntfWithFilename(NewSource.Filename);
     SourceEditorManager.ClearExecutionLines;
     SourceEditorManager.ClearErrorLines;
   end;
@@ -1717,7 +1717,7 @@ begin
   then begin
     if not Editor.HasExecutionMarks then
       Editor.FillExecutionMarks;
-    Editor.ExecutionLine := SrcLine;
+    Editor.ExecutionLine := i;
   end;
 end;
 
diff --git a/ide/sourceeditor.pp b/ide/sourceeditor.pp
index dad0f75dc1..6d80ca24dd 100644
--- a/ide/sourceeditor.pp
+++ b/ide/sourceeditor.pp
@@ -3374,7 +3374,6 @@ end;
 
 procedure TSourceEditor.SetExecutionLine(NewLine: integer);
 begin
-  NewLine := EditorComponent.IDEGutterMarks.DebugLineToSourceLine(NewLine);
   if ExecutionLine=NewLine then exit;
   if (FSharedValues.ExecutionMark = nil) then begin
     if NewLine = -1 then