diff --git a/src/ce_optionseditor.lfm b/src/ce_optionseditor.lfm
index 1c17a44d..a9cf09e9 100644
--- a/src/ce_optionseditor.lfm
+++ b/src/ce_optionseditor.lfm
@@ -7,7 +7,7 @@ inherited CEOptionEditorWidget: TCEOptionEditorWidget
   Caption = 'Options editor'
   ClientHeight = 493
   ClientWidth = 559
-  FormStyle = fsStayOnTop
+  FormStyle = fsSystemStayOnTop
   inherited Back: TPanel
     Height = 493
     Width = 559
diff --git a/src/ce_optionseditor.pas b/src/ce_optionseditor.pas
index 38810c0c..03cd26c6 100644
--- a/src/ce_optionseditor.pas
+++ b/src/ce_optionseditor.pas
@@ -57,6 +57,7 @@ var
 begin
   inherited;
   fDockable := false;
+  fModal:= true;
   fEdOptsSubj := TCEEditableOptionsSubject.create;
   //
   png := TPortableNetworkGraphic.Create;