diff --git a/SpanshRouter/AutoCompleter.py b/SpanshRouter/AutoCompleter.py
index 2677ec3..9a4bae4 100644
--- a/SpanshRouter/AutoCompleter.py
+++ b/SpanshRouter/AutoCompleter.py
@@ -39,10 +39,10 @@ class AutoCompleter(PlaceHolder):
 
         self.update_me()
 
-    def ac_foc_out(self, event):
+    def ac_foc_out(self, event=None):
         x,y = self.parent.winfo_pointerxy()
         widget_under_cursor = self.parent.winfo_containing(x,y)
-        if widget_under_cursor != self.lb and widget_under_cursor != self:
+        if (widget_under_cursor != self.lb and widget_under_cursor != self) or event is None:
             self.foc_out()
             self.hide_list()
     
diff --git a/SpanshRouter/SpanshRouter.py b/SpanshRouter/SpanshRouter.py
index 5665181..8a2531b 100644
--- a/SpanshRouter/SpanshRouter.py
+++ b/SpanshRouter/SpanshRouter.py
@@ -362,6 +362,10 @@ class SpanshRouter():
             dest = self.dest_ac.get().strip()
             efficiency = self.efficiency_slider.get()
 
+            # Hide autocomplete lists in case they're still shown
+            self.source_ac.ac_foc_out()
+            self.dest_ac.ac_foc_out()
+
             if (    source  and source != self.source_ac.placeholder and
                     dest    and dest != self.dest_ac.placeholder    ):