diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index a006ac76..9e524310 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -437,6 +437,14 @@
     "message": "Shift-click or right-click opens manager with styles applicable for current site",
     "description": "Tooltip for the 'Manage' button in the popup."
   },
+  "popupOpenEditInWindow": {
+    "message": "Open editor in a new window",
+    "description": "Label for the checkbox controlling 'edit' action behavior in the popup."
+  },
+  "popupOpenEditInWindowTooltip": {
+    "message": "Also enabled by detaching editor tab from a browser window,\nand disabled by attaching a single editor tab into another window.",
+    "description": "Label for the checkbox controlling 'edit' action behavior in the popup."
+  },
   "popupStylesFirst": {
     "message": "Styles before commands",
     "description": "Label for the checkbox controlling section order in the popup."
diff --git a/options.html b/options.html
index 9e65acb1..494c50fa 100644
--- a/options.html
+++ b/options.html
@@ -65,6 +65,14 @@
           <span i18n-text="optionsPopupWidth"></span>
           <input type="number" id="popupWidth" min="200" max="800">
         </label>
+        <label>
+          <span i18n-text="popupOpenEditInWindow"
+                i18n-title="popupOpenEditInWindowTooltip"></span>
+          <span class="onoffswitch">
+            <input type="checkbox" id="openEditInWindow">
+            <span></span>
+          </span>
+        </label>
         <label>
           <span i18n-text="popupStylesFirst"></span>
           <span class="onoffswitch">