diff --git a/src/core/js/query_shortcuts.js b/src/core/js/query_shortcuts.js
index c01ed5a20ea9819054a0809b2a3e4d5bd35de879..08a23efdc44d634f2c588173a6ac2f3d2ca0e06e 100644
--- a/src/core/js/query_shortcuts.js
+++ b/src/core/js/query_shortcuts.js
@@ -291,18 +291,28 @@ var query_shortcuts = new function () {
         );
 
         // function for inserting the generated query string into the query panel
-        var insert_to_query_panel = (_) => {
+        var insert_to_query_panel = (inputSelectorName) => {
             var values = query_shortcuts.extract_placeholder_values(shortcut_form[0]);
             var replaced_query_string = query_shortcuts.replace_placeholders_with_values(query_string, values);
-            $("#caosdb-query-textarea")
+
+            $(inputSelectorName)
                 .focus()
                 .val(replaced_query_string);
+
+            return replaced_query_string;
         };
 
         // callback for the submission
         var execute = (_) => {
-            insert_to_query_panel();
-            $("#caosdb-query-form").submit();
+
+            if ("${BUILD_MODULE_LEGACY_QUERY_FORM}" != "ENABLED") {
+                const queryString = insert_to_query_panel(".caosdb-f-query-form input");
+                window.localStorage.setItem("query.queryString", queryString);
+                $(".caosdb-f-query-panel form").submit()
+            } else {
+                insert_to_query_panel("#caosdb-query-textarea");
+                $("#caosdb-query-form").submit();
+            }
         };
 
         shortcut_form.find(".caosdb-f-query-shortcut-right-col")