Index: src/ctl/ctlSQLBox.cpp
===================================================================
--- src/ctl/ctlSQLBox.cpp	(revision 4982)
+++ src/ctl/ctlSQLBox.cpp	(working copy)
@@ -285,6 +285,7 @@
     EVT_FIND_REPLACE(-1, ctlSQLBox::OnFindDialog)
     EVT_FIND_REPLACE_ALL(-1, ctlSQLBox::OnFindDialog)
     EVT_FIND_CLOSE(-1, ctlSQLBox::OnFindDialog)
+	EVT_KILL_FOCUS(ctlSQLBox::OnKillFocus)
 END_EVENT_TABLE()
 
 
@@ -553,7 +554,12 @@
 	}
 }
 
+void ctlSQLBox::OnKillFocus(wxFocusEvent& event)
+{
+	AutoCompCancel();
+}
 
+
 extern "C" char *tab_complete(const char *allstr, const int startptr, const int endptr, void *dbptr);
 void ctlSQLBox::OnAutoComplete(wxCommandEvent& rev)
 {
Index: src/include/ctl/ctlSQLBox.h
===================================================================
--- src/include/ctl/ctlSQLBox.h	(revision 4982)
+++ src/include/ctl/ctlSQLBox.h	(working copy)
@@ -38,6 +38,7 @@
     void OnFind(wxCommandEvent& event);
     void OnReplace(wxCommandEvent& event);
     void OnFindDialog(wxFindDialogEvent& event);
+	void OnKillFocus(wxFocusEvent& event);
     
     DECLARE_DYNAMIC_CLASS(ctlSQLBox)
     DECLARE_EVENT_TABLE()