diff --git a/frontend/src/app/main/data/preview.cljs b/frontend/src/app/main/data/preview.cljs
index 7510fb089..e5865e19a 100644
--- a/frontend/src/app/main/data/preview.cljs
+++ b/frontend/src/app/main/data/preview.cljs
@@ -98,7 +98,8 @@
             closed-preview (rx/subject)
             preview (.open js/window "/#/frame-preview")
             listener-fn #(rx/push! closed-preview true)]
-        (.addEventListener preview "beforeunload" listener-fn)
+        (when (some? preview)
+          (.addEventListener preview "beforeunload" listener-fn))
         (->> (rx/from-atom (refs/all-children-objects shape-id) {:emit-current-value? true})
              (rx/take-until closed-preview)
              (rx/debounce 1000)
diff --git a/frontend/src/app/main/data/workspace/shortcuts.cljs b/frontend/src/app/main/data/workspace/shortcuts.cljs
index b8d10264d..f3d7a72d6 100644
--- a/frontend/src/app/main/data/workspace/shortcuts.cljs
+++ b/frontend/src/app/main/data/workspace/shortcuts.cljs
@@ -547,11 +547,6 @@
                           :subsections [:shape]
                           :fn #(emit-when-no-readonly (dw/create-bool :exclude))}
 
-   ;; PREVIEW
-   :preview-frame        {:tooltip (ds/meta (ds/alt ds/enter))
-                          :command (ds/c-mod "alt+enter")
-                          :fn #(emit-when-no-readonly (dp/open-preview-selected))}
-
    ;; THEME
    :toggle-theme         {:tooltip (ds/alt "M")
                           :command (ds/a-mod "m")
@@ -559,6 +554,12 @@
                           :fn #(st/emit! (with-meta (du/toggle-theme)
                                            {::ev/origin "workspace:shortcut"}))}})
 
+(def debug-shortcuts
+  ;; PREVIEW
+  {:preview-frame        {:tooltip (ds/meta (ds/alt ds/enter))
+                          :command (ds/c-mod "alt+enter")
+                          :fn #(emit-when-no-readonly (dp/open-preview-selected))}})
+
 (def opacity-shortcuts
   (into {} (->>
             (range 10)
@@ -569,7 +570,9 @@
                            :fn #(emit-when-no-readonly (dwly/pressed-opacity n))}])))))
 
 (def shortcuts
-  (merge base-shortcuts opacity-shortcuts dwtxts/shortcuts))
+  (cond-> (merge base-shortcuts opacity-shortcuts dwtxts/shortcuts)
+    *assert*
+    (merge debug-shortcuts)))
 
 (defn get-tooltip [shortcut]
   (assert (contains? shortcuts shortcut) (str shortcut))