diff --git a/options.api/apichanges.xml b/options.api/apichanges.xml
--- a/options.api/apichanges.xml
+++ b/options.api/apichanges.xml
@@ -75,6 +75,20 @@
 <!-- ACTUAL CHANGES BEGIN HERE: -->
 
 <changes>
+    <change id="OptionsDisplayer.setIsModal">
+        <api name="OptionsAPI"/>
+        <summary>API to set whether the options window should be modal or not</summary>
+        <version major="1" minor="33"/>
+        <date day="26" month="2" year="2013"/>
+        <author login="theofanis"/>
+        <compatibility addition="yes"/>
+        <description>
+            Added API to set whether the options window should be modal or not.
+	    The default behaviour is for the options window to be non-modal.
+        </description>
+        <class package="org.netbeans.api.options" name="OptionsDisplayer"/>
+        <issue number="207120"/>
+    </change>
     <change id="OptionsPanelController.handleSuccessfulSearch">
         <api name="OptionsAPI"/>
         <summary>API to handle successfull search in some panel in options window</summary>
diff --git a/options.api/manifest.mf b/options.api/manifest.mf
--- a/options.api/manifest.mf
+++ b/options.api/manifest.mf
@@ -2,6 +2,6 @@
 OpenIDE-Module: org.netbeans.modules.options.api/1
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/options/Bundle.properties
 OpenIDE-Module-Layer: org/netbeans/modules/options/resources/mf-layer.xml
-OpenIDE-Module-Specification-Version: 1.32
+OpenIDE-Module-Specification-Version: 1.33
 AutoUpdate-Show-In-Client: false
 AutoUpdate-Essential-Module: true
diff --git a/options.api/src/org/netbeans/api/options/OptionsDisplayer.java b/options.api/src/org/netbeans/api/options/OptionsDisplayer.java
--- a/options.api/src/org/netbeans/api/options/OptionsDisplayer.java
+++ b/options.api/src/org/netbeans/api/options/OptionsDisplayer.java
@@ -101,6 +101,16 @@
     public static OptionsDisplayer getDefault() {
         return INSTANCE;
     }
+
+    /**
+     * Set whether the options window should be modal or not. The default is false
+     *
+     * @param isModal true if the options window should be in modal mode, false otherwise
+     * @since 1.33
+     */
+    public void setIsModal(boolean isModal) {
+	impl.setIsModal(isModal);
+    }
     
     /**
      * Open the options dialog with no guarantee which category is pre-selected.
diff --git a/options.api/src/org/netbeans/modules/options/OptionsDisplayerImpl.java b/options.api/src/org/netbeans/modules/options/OptionsDisplayerImpl.java
--- a/options.api/src/org/netbeans/modules/options/OptionsDisplayerImpl.java
+++ b/options.api/src/org/netbeans/modules/options/OptionsDisplayerImpl.java
@@ -125,6 +125,10 @@
             Exceptions.printStackTrace(ex);
         }
     }
+
+    public void setIsModal(boolean isModal) {
+	this.modal = isModal;
+    }
     
     public boolean isOpen() {
         return dialog != null;