diff --git a/wxPython/wx/py/CHANGES.txt b/wxPython/wx/py/CHANGES.txt
index 303ecc6787..d92d1ae041 100644
--- a/wxPython/wx/py/CHANGES.txt
+++ b/wxPython/wx/py/CHANGES.txt
@@ -9,7 +9,7 @@ Removed docs tabs from crust interface:
 
 Fixed Calltip tab refresh problem on Windows.
 
-shell.autoCompleteAutoHide added with default of True.
+shell.autoCompleteAutoHide added with default of False.
 
 Changed default namespace of Shell to __main__.__dict__, instead of an
 empty dictionary.
diff --git a/wxPython/wx/py/editwindow.py b/wxPython/wx/py/editwindow.py
index e95ba17218..dddd906f82 100644
--- a/wxPython/wx/py/editwindow.py
+++ b/wxPython/wx/py/editwindow.py
@@ -82,7 +82,7 @@ class EditWindow(stc.StyledTextCtrl):
         self.autoCompleteIncludeDouble = True
         self.autoCompleteCaseInsensitive = True
         self.AutoCompSetIgnoreCase(self.autoCompleteCaseInsensitive)
-        self.autoCompleteAutoHide = True
+        self.autoCompleteAutoHide = False
         self.AutoCompSetAutoHide(self.autoCompleteAutoHide)
         self.AutoCompStops(' .,;:([)]}\'"\\<>%^&+-=*/|`')
         # Do we want to automatically pop up command argument help?