diff --git a/src/apps/deskbar/TimeView.cpp b/src/apps/deskbar/TimeView.cpp
index 3cc669b480..c7de7b7ff7 100644
--- a/src/apps/deskbar/TimeView.cpp
+++ b/src/apps/deskbar/TimeView.cpp
@@ -110,8 +110,8 @@ TTimeView::TTimeView(BMessage* data)
 
 TTimeView::~TTimeView()
 {
-	if (fCalendarWindow != NULL)
-		fCalendarWindow->Quit();
+	if (fCalendarWindowMessenger.IsValid())
+		fCalendarWindowMessenger.PostMessage(B_QUIT_REQUESTED);
 
 	delete fTimeFormat;
 	delete fDateFormat;