diff --git a/js/apps/system/aardvark/frontend/js/views/queryView.js b/js/apps/system/aardvark/frontend/js/views/queryView.js
index 304e9c2c4b..a493944f7a 100644
--- a/js/apps/system/aardvark/frontend/js/views/queryView.js
+++ b/js/apps/system/aardvark/frontend/js/views/queryView.js
@@ -615,6 +615,10 @@
           $("#" + element).parent().addClass("active");
           $(divId).addClass("active");
           $(contentDivId).show();
+          if (switchId === 'query-switch') {
+            // issue #1000: set focus to query input
+            $('#aqlEditor .ace_text-input').focus();
+          }
         } else {
           $("#" + element).parent().removeClass("active");
           $(divId).removeClass("active");