diff --git a/src/ce_editor.lfm b/src/ce_editor.lfm
index 0ff9cf26..313e05e3 100644
--- a/src/ce_editor.lfm
+++ b/src/ce_editor.lfm
@@ -6,7 +6,6 @@ inherited CEEditorWidget: TCEEditorWidget
   Caption = 'Source editor'
   ClientHeight = 406
   ClientWidth = 465
-  OnCloseQuery = FormCloseQuery
   inherited Back: TPanel
     Height = 406
     Width = 465
diff --git a/src/ce_editor.pas b/src/ce_editor.pas
index 82b631b9..f67e600b 100644
--- a/src/ce_editor.pas
+++ b/src/ce_editor.pas
@@ -34,7 +34,6 @@ type
     macRecorder: TSynMacroRecorder;
     editorStatus: TStatusBar;
     mnuEditor: TPopupMenu;
-    procedure FormCloseQuery(Sender: TObject; var CanClose: boolean);
     procedure mnuedCopyClick(Sender: TObject);
     procedure mnuedCutClick(Sender: TObject);
     procedure mnuEditorPopup(Sender: TObject);
@@ -81,6 +80,7 @@ type
   public
     constructor create(aOwner: TComponent); override;
     destructor destroy; override;
+    function closeQuery: boolean; override;
   end;
 
 implementation
@@ -144,11 +144,10 @@ begin
   inherited;
 end;
 
-procedure TCEEditorWidget.FormCloseQuery(Sender: TObject; var CanClose: boolean);
+function TCEEditorWidget.closeQuery: boolean;
 begin
-  // grants the window not to be undocked.
-  // additional fix, depend on of http://bugs.freepascal.org/view.php?id=28325
-  CanClose := Parent = nil;
+  result := inherited;
+  result := result and (Parent = nil);
 end;
 {$ENDREGION}
 
diff --git a/src/ce_infos.pas b/src/ce_infos.pas
index e1aca61b..9fd25682 100644
--- a/src/ce_infos.pas
+++ b/src/ce_infos.pas
@@ -154,8 +154,8 @@ var
   toolItem: TToolInfo;
 begin
   inherited;
-  fModal := true;
-  fDockable := false;
+  fIsModal := true;
+  fIsDockable := false;
   //
   toolItem := TToolInfo.Construct(self, tikRunning, 'dcd-server');
   toolItem.Parent := boxTools;
diff --git a/src/ce_optionseditor.pas b/src/ce_optionseditor.pas
index 83d8e072..6ea2fd41 100644
--- a/src/ce_optionseditor.pas
+++ b/src/ce_optionseditor.pas
@@ -66,8 +66,8 @@ var
   png: TPortableNetworkGraphic;
 begin
   inherited;
-  fDockable := false;
-  fModal:= true;
+  fIsDockable := false;
+  fIsModal:= true;
   fEdOptsSubj := TCEEditableOptionsSubject.create;
   inspector.CheckboxForBoolean := true;
   inspector.PropertyEditorHook.AddHandlerModified(@inspectorModified);
diff --git a/src/ce_widget.pas b/src/ce_widget.pas
index 2b5410b9..fc6028f3 100644
--- a/src/ce_widget.pas
+++ b/src/ce_widget.pas
@@ -31,10 +31,10 @@ type
     procedure updaterAutoProc(Sender: TObject);
     procedure updaterLatchProc(Sender: TObject);
   protected
-    fDockable: boolean;
-    fModal: boolean;
+    fIsDockable: boolean;
+    fIsModal: boolean;
     fID: string;
-    // a descendant overrides to implementi a periodic update.
+    // a descendant overrides to implement a periodic update.
     procedure updateLoop; virtual;
     // a descendant overrides to implement an imperative update.
     procedure updateImperative; virtual;
@@ -52,6 +52,8 @@ type
   public
     constructor create(aOwner: TComponent); override;
     destructor destroy; override;
+    // prevent closing when 'locked' is cjecked in the header context menu
+    function closeQuery: boolean; override;
     // restarts the wait period to the delayed update event.
     // if not re-called during 'updaterByDelayDuration' ms then
     // 'UpdateByDelay' is called once.
@@ -77,7 +79,7 @@ type
     // returns true if one of the three updater is processing.
     property updating: boolean read fUpdating;
     // true by default, allow a widget to be docked.
-    property isDockable: boolean read fDockable;
+    property isDockable: boolean read fIsDockable;
     // not if isDockable, otherwise a the widget is shown as modal form.
     property isModal: boolean read getIfModal;
   end;
@@ -118,7 +120,7 @@ var
   itm: TmenuItem;
 begin
   inherited;
-  fDockable := true;
+  fIsDockable := true;
   fUpdaterAuto := TTimer.Create(self);
   fUpdaterAuto.Interval := 70;
   fUpdaterAuto.OnTimer := @updaterAutoProc;
@@ -144,10 +146,18 @@ begin
   inherited;
 end;
 
+function TCEWidget.closeQuery: boolean;
+begin
+  result := inherited;
+  if fIsDockable and (not DockMaster.AllowDragging) and not
+    (DockMaster.GetAnchorSite(self).GetTopParent = DockMaster.GetAnchorSite(self)) then
+      result := false;
+end;
+
 function TCEWidget.getIfModal: boolean;
 begin
   if isDockable then result := false
-  else result := fModal;
+  else result := fIsModal;
 end;
 
 procedure TCEWidget.showWidget;