diff --git a/src/apps/deskbar/BarApp.cpp b/src/apps/deskbar/BarApp.cpp
index 59075285034..e721f09c664 100644
--- a/src/apps/deskbar/BarApp.cpp
+++ b/src/apps/deskbar/BarApp.cpp
@@ -184,6 +184,7 @@ TBarApp::QuitRequested()
 						fPreferencesWindow->PostMessage(B_QUIT_REQUESTED);
 					fPreferencesWindow->Unlock();
 				}
+				delete fPreferencesWindow;
 				break;
 			}
 		}
@@ -480,10 +481,6 @@ TBarApp::MessageReceived(BMessage* message)
 				fSettings.recentDocsEnabled = enabled && count > 0;
 			break;
 
-		case kConfigClose:
-			fPreferencesWindow = NULL;
-			break;
-
 		case B_SOME_APP_LAUNCHED:
 		{
 			team_id team = -1;
diff --git a/src/apps/deskbar/PreferencesWindow.cpp b/src/apps/deskbar/PreferencesWindow.cpp
index 41c825952d9..ba4cf8926df 100644
--- a/src/apps/deskbar/PreferencesWindow.cpp
+++ b/src/apps/deskbar/PreferencesWindow.cpp
@@ -288,7 +288,6 @@ PreferencesWindow::PreferencesWindow(BRect frame)
 PreferencesWindow::~PreferencesWindow()
 {
 	UpdateRecentCounts();
-	be_app->PostMessage(kConfigClose);
 }
 
 
@@ -327,19 +326,10 @@ PreferencesWindow::MessageReceived(BMessage* message)
 bool
 PreferencesWindow::QuitRequested()
 {
-	bool isHidden = false;
-
-	if (Lock()) {
-		isHidden = IsHidden();
-		Unlock();
-	} else
-		return true;
-
-	if (isHidden)
+	if (IsHidden())
 		return true;
 
 	Hide();
-
 	return false;
 }
 
diff --git a/src/apps/deskbar/PreferencesWindow.h b/src/apps/deskbar/PreferencesWindow.h
index c47b4c86a76..6d07e58eb50 100644
--- a/src/apps/deskbar/PreferencesWindow.h
+++ b/src/apps/deskbar/PreferencesWindow.h
@@ -10,7 +10,6 @@
 
 
 const uint32 kConfigShow			= 'show';
-const uint32 kConfigClose			= 'canc';
 const uint32 kUpdateRecentCounts	= 'upct';
 const uint32 kEditMenuInTracker		= 'mtrk';