diff --git a/src/preferences/screen/AlertWindow.cpp b/src/preferences/screen/AlertWindow.cpp
index 656f4719a1..26b4f5f96a 100644
--- a/src/preferences/screen/AlertWindow.cpp
+++ b/src/preferences/screen/AlertWindow.cpp
@@ -30,8 +30,8 @@ AlertWindow::AlertWindow(BMessenger target)
 
 	// center window on screen
 	BScreen screen(this);
-	MoveTo((screen.Frame().Width() - Frame().Width()) / 2,
-		(screen.Frame().Height() - Frame().Height()) / 2);
+	MoveTo(screen.Frame().left + (screen.Frame().Width() - Frame().Width()) / 2,
+		screen.Frame().top + (screen.Frame().Height() - Frame().Height()) / 2);
 }
 
 
diff --git a/src/preferences/screen/ScreenWindow.cpp b/src/preferences/screen/ScreenWindow.cpp
index 78c8bf00cd..1c0abb81ac 100644
--- a/src/preferences/screen/ScreenWindow.cpp
+++ b/src/preferences/screen/ScreenWindow.cpp
@@ -902,6 +902,7 @@ ScreenWindow::MessageReceived(BMessage* message)
 				fChangingAllWorkspaces = false;
 			}
 
+			fScreenMode.UpdateOriginalMode();
 			UpdateActiveMode();
 			break;
 		}