diff --git a/ide/debugmanager.pas b/ide/debugmanager.pas
index e1132075ba..4d7aa2a07e 100644
--- a/ide/debugmanager.pas
+++ b/ide/debugmanager.pas
@@ -53,7 +53,7 @@ uses
   MainBar, MainIntf, MainBase, BaseBuildManager,
   SourceMarks,
   DebuggerDlg, Watchesdlg, BreakPointsdlg, LocalsDlg, WatchPropertyDlg,
-  CallStackDlg, EvaluateDlg, RegistersDlg, {AssemblerDlg,} DBGOutputForm,
+  CallStackDlg, EvaluateDlg, RegistersDlg, AssemblerDlg, DBGOutputForm,
   GDBMIDebugger, SSHGDBMIDebugger, ProcessDebugger,
   BaseDebugManager;
 
@@ -1324,10 +1324,9 @@ begin
           mtInformation, [mbOK],0);
         end;
         FDebugger.FileName := '';
-{
+
         if FDialogs[ddtAssembler] <> nil
         then TAssemblerDlg(FDialogs[ddtAssembler]).SetLocation(nil, 0);
-}
       end;
     end;
 
@@ -1384,12 +1383,11 @@ begin
     end;
   end;
 
-{  if FDialogs[ddtAssembler] <> nil
+  if FDialogs[ddtAssembler] <> nil
   then begin
     TAssemblerDlg(FDialogs[ddtAssembler]).SetLocation(FDebugger, Alocation.Address);
     if SrcLine < 1 then Exit;
   end;
-}
 
   if not GetFullFilename(SrcFile, true) then exit;
 
@@ -1452,7 +1450,7 @@ procedure TDebugManager.ViewDebugDialog(const ADialogType: TDebugDialogType);
 const
   DEBUGDIALOGCLASS: array[TDebugDialogType] of TDebuggerDlgClass = (
     TDbgOutputForm, TBreakPointsDlg, TWatchesDlg, TLocalsDlg, TCallStackDlg,
-    TEvaluateDlg, TRegistersDlg, nil{TAssemblerDlg}
+    TEvaluateDlg, TRegistersDlg, TAssemblerDlg
   );
 var
   CurDialog: TDebuggerDlg;
@@ -1548,11 +1546,11 @@ begin
 end;
 
 procedure TDebugManager.InitAssemblerDlg;
-{var
-  TheDialog: TAssemblerDlg;}
+var
+  TheDialog: TAssemblerDlg;
 begin
-{  TheDialog := TAssemblerDlg(FDialogs[ddtAssembler]);
-  TheDialog.SetLocation(FDebugger, FCurrentLocation.Address);}
+  TheDialog := TAssemblerDlg(FDialogs[ddtAssembler]);
+  TheDialog.SetLocation(FDebugger, FCurrentLocation.Address);
 end;
 
 procedure TDebugManager.InitCallStackDlg;