diff --git a/src/bin/screen_blanker/PasswordWindow.h b/src/bin/screen_blanker/PasswordWindow.h
index a92d67ca51..c3d1393875 100644
--- a/src/bin/screen_blanker/PasswordWindow.h
+++ b/src/bin/screen_blanker/PasswordWindow.h
@@ -10,7 +10,7 @@
 #include <TextControl.h>
 #include <Button.h>
 
-const int32 UNLOCK_MESSAGE = 'ULMS';
+const static int32 UNLOCK_MESSAGE = 'ULMS';
 
 class PasswordWindow : public BWindow
 {
@@ -18,9 +18,10 @@ class PasswordWindow : public BWindow
 		PasswordWindow() : BWindow(BRect(100,100,400,230),"pwView",B_NO_BORDER_WINDOW_LOOK, B_FLOATING_ALL_WINDOW_FEEL  ,
 				B_NOT_MOVABLE | B_NOT_CLOSABLE |B_NOT_ZOOMABLE | B_NOT_MINIMIZABLE | B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS ,
 				B_ALL_WORKSPACES), fDie(false) { Setup(); }
+
 		void Setup(void);
 		const char *GetPassword(void) {return fPassword->Text();}
-		void SetPassword(const char* text) { Lock(); fPassword->SetText(text); Unlock(); }
+		void SetPassword(const char* text) { Lock(); fPassword->SetText(text); fPassword->MakeFocus(true); Unlock(); }
 
 		bool fDie;
 	private:
diff --git a/src/bin/screen_blanker/ScreenSaverApp.cpp b/src/bin/screen_blanker/ScreenSaverApp.cpp
index 0afd72b4b9..7ef2146e07 100755
--- a/src/bin/screen_blanker/ScreenSaverApp.cpp
+++ b/src/bin/screen_blanker/ScreenSaverApp.cpp
@@ -17,7 +17,7 @@
 
 #include "ScreenSaverApp.h"
 
-const int32 RESUME_SAVER = 'RSSV';
+const static int32 RESUME_SAVER = 'RSSV';
 
 
 // Start the server application. Set pulse to fire once per second.
@@ -106,6 +106,7 @@ ScreenSaverApp::MessageReceived(BMessage *message)
 			fWin->Lock();
 			if (B_OK==fWin->SetFullScreen(true)) {
 				HideCursor();
+				fPww->Hide();
 			}
 			resume_thread(fThreadID);
 			fWin->Unlock();