diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/queryView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/queryView.js
index 41c5b3d882..9b1ef0ec8e 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/queryView.js
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/queryView.js
@@ -2638,6 +2638,14 @@
       var found = this.aqlEditor.find(text);
 
       if (!found && pos) {
+        try {
+          row = parseInt(row);
+          if (row > 0) {
+            row = row - 1;
+          }
+        } catch (ignore) {
+        }
+
         this.aqlEditor.selection.moveCursorToPosition({row: row, column: 0});
         this.aqlEditor.selection.selectLine();
       }