diff --git a/src/core/js/ext_prop_display.js b/src/core/js/ext_prop_display.js
index f74d700078b2b8ab69174ab05c9e95c6df33b109..92df5949ad85f2bfc9890ad063103b8ed1136956 100644
--- a/src/core/js/ext_prop_display.js
+++ b/src/core/js/ext_prop_display.js
@@ -210,22 +210,26 @@ var prop_display = new function ($, edit_mode, getEntityName, getEntityRole, get
             this.displayProperties(entities, conf, allTypes, userName, userRoles);
             // If we are in the edit mode, (un)hide properties after ending
             // the editing of an entity
-            document.body.addEventListener(edit_mode.start_edit.type, (e) => {
-                edit_mode.app.onAfterShowResults = this._displayPropertiesWrapper(edit_mode.app.onAfterShowResults, conf, allTypes);
-            }, true);
+            for (let event_t of [edit_mode.start_edit.type, preview.showPreviewEvent.type]) {
+                document.body.addEventListener(event_t, (e) => {
+                    edit_mode.app.onAfterShowResults = this._displayPropertiesWrapper(edit_mode.app.onAfterShowResults, conf, allTypes);
+                }, true);
+            }
 
         } else {
             // There are no properties to be hidden, so make this clear in HTML body
             $("body").attr("data-hidden-properties", "false")
             this.unhideAllProperties();
-            document.body.addEventListener(edit_mode.start_edit.type, (e) => {
-                // also unhide properties when leaving the edit mode
-                // TODO(fspreck): We're lacking a proper state/event here in the
-                // edit mode, so do this on "init", since this is the state to which
-                // the state machine returns after either successfully saving an
-                // entity or canceling the edit.
-                edit_mode.app.onAfterShowResults = this._unhideAllPropertiesWrapper(edit_mode.app.onAfterShowResults);
-            }, true);
+            for (let event_t of [edit_mode.start_edit.type, preview.showPreviewEvent.type]) {
+                document.body.addEventListener(edit_mode.start_edit.type, (e) => {
+                    // also unhide properties when leaving the edit mode
+                    // TODO(fspreck): We're lacking a proper state/event here in the
+                    // edit mode, so do this on "init", since this is the state to which
+                    // the state machine returns after either successfully saving an
+                    // entity or canceling the edit.
+                    edit_mode.app.onAfterShowResults = this._unhideAllPropertiesWrapper(edit_mode.app.onAfterShowResults);
+                }, true);
+            }
         }
     }
 }($, edit_mode, getEntityName, getEntityRole, getPropertyElements, getPropertyName, getUserName, getUserRoles, log.getLogger("ext_prop_display"), load_config, query);