diff --git a/source/childwin.dfm b/source/childwin.dfm
index c02563eb..4b661e16 100644
--- a/source/childwin.dfm
+++ b/source/childwin.dfm
@@ -1042,6 +1042,7 @@ object MDIChild: TMDIChild
                 TabOrder = 1
                 OnClick = lboxQueryHelpersClick
                 OnDblClick = lboxQueryHelpersDblClick
+                OnKeyUp = controlsKeyUp
               end
             end
           end
diff --git a/source/childwin.pas b/source/childwin.pas
index 6db5304b..b8e5ecf7 100644
--- a/source/childwin.pas
+++ b/source/childwin.pas
@@ -4488,7 +4488,16 @@ begin
   else if ListColumns.Focused and (ListColumns.Selected <> nil) then
   begin
     keyword := ListColumns.Selected.SubItems[0];
+  end
+  else if lboxQueryHelpers.Focused then
+  begin
+    // Makes only sense if one of the tabs "SQL fn" or "SQL kw" was selected
+    if tabsetQueryHelpers.TabIndex in [1,2] then
+    begin
+      keyword := lboxQueryHelpers.Items[lboxQueryHelpers.ItemIndex];
+    end;
   end;
+
   // Clean existing paranthesis, fx: char(64)
   if Pos( '(', keyword ) > 0 then
   begin