diff --git a/source/childwin.dfm b/source/childwin.dfm
index 7ab1b680..0ce40d7f 100644
--- a/source/childwin.dfm
+++ b/source/childwin.dfm
@@ -1226,7 +1226,7 @@ object MDIChild: TMDIChild
             Font.Height = -11
             Font.Name = 'Tahoma'
             Font.Style = []
-            Options = [dgEditing, dgAlwaysShowEditor, dgTitles, dgIndicator, dgColumnResize, dgColLines, dgRowLines, dgTabs, dgAlwaysShowSelection, dgConfirmDelete, dgMultiSelect]
+            Options = [dgEditing, dgTitles, dgIndicator, dgColumnResize, dgColLines, dgRowLines, dgTabs, dgAlwaysShowSelection, dgConfirmDelete, dgMultiSelect]
             ParentFont = False
             PopupMenu = popupResultGrid
             TabOrder = 2
diff --git a/source/childwin.pas b/source/childwin.pas
index a702c218..b13a1226 100644
--- a/source/childwin.pas
+++ b/source/childwin.pas
@@ -599,8 +599,7 @@ type
       prefCSVSeparator,
       prefCSVEncloser,
       prefCSVTerminator          : String[10];
-      prefLogToFile,
-      prefDataAlwaysEditMode     : Boolean;
+      prefLogToFile              : Boolean;
 
 
       procedure Init(AConn : POpenConnProf; AMysqlConn : TMysqlConn);
@@ -1076,20 +1075,6 @@ begin
     else
       prefRememberFilters := True;
 
-    // Toggle "always in editor" mode for dbgrids
-    if reg.ValueExists( 'DataAlwaysEditMode' ) then
-      prefDataAlwaysEditMode := reg.ReadBool( 'DataAlwaysEditMode' )
-    else
-      prefDataAlwaysEditMode := False;
-    if prefDataAlwaysEditMode then begin
-      gridData.Options := gridData.Options + [dgAlwaysShowEditor];
-      gridQuery.Options := gridQuery.Options + [dgAlwaysShowEditor];
-    end
-    else begin
-      gridData.Options := gridData.Options - [dgAlwaysShowEditor];
-      gridQuery.Options := gridQuery.Options - [dgAlwaysShowEditor];
-    end;
-
     // Restore width of columns of all VirtualTrees
     RestoreListSetup(ListVariables);
     RestoreListSetup(ListProcesses);
diff --git a/source/options.dfm b/source/options.dfm
index 69024636..4cab9464 100644
--- a/source/options.dfm
+++ b/source/options.dfm
@@ -415,7 +415,7 @@ object optionsform: Toptionsform
         Caption = 
           'Change this font in order to view special language characters in' +
           ' data-grids:'
-        TabOrder = 7
+        TabOrder = 6
         object Label21: TLabel
           Left = 20
           Top = 24
@@ -482,15 +482,6 @@ object optionsform: Toptionsform
           TabOrder = 3
         end
       end
-      object chkDataAlwaysEditMode: TCheckBox
-        Left = 8
-        Top = 92
-        Width = 337
-        Height = 17
-        Caption = 'Data-grids always in editor-mode'
-        TabOrder = 6
-        OnClick = Modified
-      end
       object CheckBoxlimit: TCheckBox
         Left = 8
         Top = 40
diff --git a/source/options.pas b/source/options.pas
index c909ced1..404ff59a 100644
--- a/source/options.pas
+++ b/source/options.pas
@@ -70,7 +70,6 @@ type
     Label22: TLabel;
     EditFontSize: TEdit;
     UpDownFontSize: TUpDown;
-    chkDataAlwaysEditMode: TCheckBox;
     CheckBoxlimit: TCheckBox;
     EditLimit: TEdit;
     UpDownLimit: TUpDown;
@@ -189,7 +188,6 @@ begin
   reg.WriteInteger('DataFontSize', UpDownDataFontSize.Position);
   reg.WriteBool('RememberFilters', chkRememberFilters.Checked);
   reg.WriteBool('LogToFile', chkLogToFile.Checked);
-  reg.WriteBool('DataAlwaysEditMode', chkDataAlwaysEditMode.Checked);
 
   // Close registry key
   reg.CloseKey;
@@ -213,16 +211,6 @@ begin
     cwin.gridQuery.Font := self.Panel8.font;
     cwin.DBMemo1.Font := self.Panel8.font;
     cwin.gridData.Refresh;
-    // Set the grid-cells to always-edit-mode if set
-    cwin.prefDataAlwaysEditMode := chkDataAlwaysEditMode.Checked;
-    if cwin.prefDataAlwaysEditMode then begin
-      cwin.gridData.Options := cwin.gridData.Options + [dgAlwaysShowEditor];
-      cwin.gridQuery.Options := cwin.gridQuery.Options + [dgAlwaysShowEditor];
-    end
-    else begin
-      cwin.gridData.Options := cwin.gridData.Options - [dgAlwaysShowEditor];
-      cwin.gridQuery.Options := cwin.gridQuery.Options - [dgAlwaysShowEditor];
-    end;
     cwin.prefRememberFilters := chkRememberFilters.Checked;
     cwin.prefLogsqlnum := self.updownLogSQLNum.Position;
     cwin.prefLogSqlWidth := self.updownLogSnip.Position;
@@ -361,10 +349,6 @@ begin
     chkLogToFile.Checked := reg.ReadBool('LogToFile');
   btnOpenLogFolder.Enabled := DirectoryExists(DirnameSessionLogs);
 
-  // Remember data pane filters across sessions
-  if reg.ValueExists('DataAlwaysEditMode') then
-    chkDataAlwaysEditMode.Checked := reg.ReadBool('DataAlwaysEditMode');
-
   // Close registry key
   reg.CloseKey;
   reg.Free;