diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index 6e042f30b6..9530ed276b 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -118,7 +118,7 @@ BEOS_ADD_ONS_PRINT = Canon\ LIPS3\ Compatible Canon\ LIPS4\ Compatible
 BEOS_ADD_ONS_PRINT_TRANSPORT = HP\ JetDirect IPP LPR Parallel\ Port
 	Print\ To\ File Serial\ Port USB\ Port
 ;
-BEOS_ADD_ONS_SCREENSAVERS = DebugNow Haiku IFS Spider Message ;
+BEOS_ADD_ONS_SCREENSAVERS = DebugNow Flurry Haiku IFS Spider Message ;
 BEOS_ADD_ONS_DRIVERS_AUDIO = auich auvia echo3g emuxki ; #hda
 BEOS_ADD_ONS_DRIVERS_AUDIO_OLD = ; #cmedia sis7018 usb_audio ;
 BEOS_ADD_ONS_DRIVERS_GRAPHICS = $(X86_ONLY)radeon $(X86_ONLY)nvidia
diff --git a/src/bin/screen_blanker/ScreenBlanker.cpp b/src/bin/screen_blanker/ScreenBlanker.cpp
index 5463e9ba75..3ac9a87fe7 100644
--- a/src/bin/screen_blanker/ScreenBlanker.cpp
+++ b/src/bin/screen_blanker/ScreenBlanker.cpp
@@ -278,14 +278,14 @@ ScreenBlanker::QuitRequested()
 void
 ScreenBlanker::_Shutdown()
 {
-	delete fRunner;
-
 	if (fWindow) {
 		fWindow->Hide();
 
 		if (fWindow->Lock())
 			fWindow->Quit();
 	}
+	
+	delete fRunner;
 }