diff --git a/src/ce_gdb.lfm b/src/ce_gdb.lfm
index c51ac248..8c575409 100644
--- a/src/ce_gdb.lfm
+++ b/src/ce_gdb.lfm
@@ -83,6 +83,7 @@ inherited CEGdbWidget: TCEGdbWidget
               Top = 24
               Width = 505
               Align = alClient
+              AutoWidthLastColumn = True
               BorderSpacing.Around = 2
               Columns = <              
                 item
@@ -91,7 +92,6 @@ inherited CEGdbWidget: TCEGdbWidget
                   Width = 46
                 end              
                 item
-                  AutoSize = True
                   Caption = 'value'
                   Width = 455
                 end>
@@ -130,6 +130,7 @@ inherited CEGdbWidget: TCEGdbWidget
               Width = 505
               Align = alClient
               AutoSort = False
+              AutoWidthLastColumn = True
               BorderSpacing.Around = 2
               Columns = <              
                 item
@@ -138,7 +139,6 @@ inherited CEGdbWidget: TCEGdbWidget
                   Width = 59
                 end              
                 item
-                  AutoSize = True
                   Caption = 'instruction'
                   Width = 442
                 end>
@@ -217,6 +217,8 @@ inherited CEGdbWidget: TCEGdbWidget
             Top = 0
             Width = 509
             Align = alClient
+            AutoSort = False
+            AutoWidthLastColumn = True
             Columns = <            
               item
                 AutoSize = True
@@ -229,12 +231,12 @@ inherited CEGdbWidget: TCEGdbWidget
                 Width = 59
               end            
               item
-                AutoSize = True
                 Caption = 'filename'
-                Width = 367
+                Width = 384
               end>
             GridLines = True
             ReadOnly = True
+            ScrollBars = ssAutoBoth
             TabOrder = 0
             ViewStyle = vsReport
             OnDblClick = lstCallStackDblClick
@@ -251,6 +253,7 @@ inherited CEGdbWidget: TCEGdbWidget
             Top = 0
             Width = 509
             Align = alClient
+            AutoSort = False
             AutoWidthLastColumn = True
             Columns = <            
               item
@@ -285,10 +288,11 @@ inherited CEGdbWidget: TCEGdbWidget
               end            
               item
                 Caption = 'line'
-                Width = 200
+                Width = 217
               end>
             GridLines = True
             ReadOnly = True
+            ScrollBars = ssAutoBoth
             TabOrder = 0
             ViewStyle = vsReport
             OnDblClick = lstThreadsDblClick
diff --git a/src/ce_gdb.pas b/src/ce_gdb.pas
index 914abc22..0c9b805b 100644
--- a/src/ce_gdb.pas
+++ b/src/ce_gdb.pas
@@ -1319,6 +1319,7 @@ begin
       btnReg.Enabled:=false;
       btnVariables.Enabled:=false;
       btnStack.Enabled:=false;
+      btnWatch.Enabled:=false;
       clearDisplays;
     end;
     gsPaused:
@@ -1332,6 +1333,7 @@ begin
       btnReg.Enabled:=true;
       btnVariables.Enabled:=true;
       btnStack.Enabled:=true;
+      btnWatch.Enabled:=true;
     end;
     gsRunning:
     begin
@@ -1344,6 +1346,7 @@ begin
       btnReg.Enabled:=false;
       btnVariables.Enabled:=false;
       btnStack.Enabled:=false;
+      btnWatch.Enabled:=false;
     end;
   end;
 end;
@@ -2217,6 +2220,8 @@ procedure TCEGdbWidget.infoAsm(const fname: string);
 var
   cmd: string;
 begin
+  if not fname.fileExists or (fLastLine = '-1') or (fLastLine = '0') then
+    exit;
   cmd := format('-data-disassemble -f %s -l %s -n -1 -- 0', [fname, fLastLine]);
   //cmd := format('-data-disassemble -s %s -e $pc -- 0', [fLastOffset]);
   gdbCommand(cmd, @gdboutJsonize);