diff --git a/src/core/js/query_shortcuts.js b/src/core/js/query_shortcuts.js
index e937c4a640521660ed872ea5377c3e41c78c1626..c01ed5a20ea9819054a0809b2a3e4d5bd35de879 100644
--- a/src/core/js/query_shortcuts.js
+++ b/src/core/js/query_shortcuts.js
@@ -159,12 +159,13 @@ var query_shortcuts = new function () {
 
         if (body.children(".caosdb-f-query-shortcut").length > 0) {
             // append if not empty
-            var queryPanelSelectorName = "#caosdb-query-panel";
             if ("${BUILD_MODULE_LEGACY_QUERY_FORM}" != "ENABLED") {
                 // The selector has a different name with the new panel
-                queryPanelSelectorName = "#caosdb-f-query-panel";
+                const queryPanelSelectorName = ".caosdb-f-query-form";
+                $(queryPanelSelectorName).after(shortcuts_panel);
+            } else {
+                $("#caosdb-query-panel").append(shortcuts_panel);
             }
-            $(queryPanelSelectorName).append(shortcuts_panel);
         }
 
         return shortcuts_panel[0];
@@ -1133,6 +1134,9 @@ var query_shortcuts = new function () {
             color: #333;
     }
 
+    .caosdb-f-query-panel.condensed .caosdb-shortcuts-container {
+        display: none;
+    }
     `;
 
     var styleSheet = document.createElement("style");