Index: orca_gui_prefs.py
===================================================================
--- orca_gui_prefs.py	(revision 1964)
+++ orca_gui_prefs.py	(working copy)
@@ -260,7 +260,15 @@
         self.window.resize(790,580);
 
         self._setKeyEchoItems()
+        self._initSpeechState()
+        self.serverChoices = None
+        self._initGUIState()
+        self.initializing = False
 
+    def _initSpeechState(self):
+        """Initialize the various speech components.
+        """
+
         factories = speech.getSpeechServerFactories()
         if len(factories) == 0:
             self.prefsDict["enableSpeech"] = False
@@ -314,11 +322,11 @@
                       "orca_gui_prefs._init: servers: %s" \
                       % servers)
 
-        self.serverChoices = None
+        self.speechServersModel.clear()
         self._setupServers()
+
+        self.voicesModel.clear()
         self._setupVoices()
-        self._initGUIState()
-        self.initializing = False
 
     def _setVoiceSettingForVoiceType(self, voiceType):
         """Set the family, rate, pitch and volume GUI components based
@@ -1915,6 +1923,7 @@
         for factory in self.workingFactories:
             factory.SpeechServer.shutdownActiveServers()
         orca.loadUserSettings()
+        self._initSpeechState()
         self._populateKeyBindings()
 
     def cancelButtonClicked(self, widget):
