diff --git a/src/preferences/screensaver/ScreenSaverWindow.cpp b/src/preferences/screensaver/ScreenSaverWindow.cpp
index 1b1254caa3..989354c0d5 100644
--- a/src/preferences/screensaver/ScreenSaverWindow.cpp
+++ b/src/preferences/screensaver/ScreenSaverWindow.cpp
@@ -351,6 +351,7 @@ ModulesView::MessageReceived(BMessage* message)
 			else
 				fSettings.SetModuleName(item->Text());
 
+			SaveState();
 			_CloseSaver();
 			_OpenSaver();
 			break;
@@ -469,9 +470,7 @@ ModulesView::_CloseSaver()
 		fSaverRunner->Quit();
 	if (saver != NULL)
 		saver->StopConfig();
-
-	SaveState();
-
+	
 	delete view;
 	delete fSettingsView;
 	delete fSaverRunner;