diff --git a/Units/Misc/v_autocompleteform.pas b/Units/Misc/v_autocompleteform.pas
index 3f6c5da..84791a5 100644
--- a/Units/Misc/v_autocompleteform.pas
+++ b/Units/Misc/v_autocompleteform.pas
@@ -543,7 +543,7 @@ begin
       VK_DOWN:
         if (ListBox.Count > 0) and (ListBox.ItemIndex + 1 < ListBox.Count) then
           ListBox.ItemIndex := ListBox.ItemIndex + 1;
-      VK_RETURN:
+      VK_RETURN, VK_TAB:
         ListBox.DblClick;
       VK_ESCAPE:
         Hide;