diff --git a/src/apps/powerstatus/PowerStatusView.cpp b/src/apps/powerstatus/PowerStatusView.cpp
index f7374482d1..c9bfbc08b2 100644
--- a/src/apps/powerstatus/PowerStatusView.cpp
+++ b/src/apps/powerstatus/PowerStatusView.cpp
@@ -612,6 +612,11 @@ PowerStatusReplicant::~PowerStatusReplicant()
 	if (fMessengerExist)
 		delete fExtWindowMessenger;
 
+	if (fExtendedWindow && fExtendedWindow->Lock()) {
+			fExtendedWindow->Quit();
+			fExtendedWindow = NULL;
+	}
+
 	fDriverInterface->StopWatching(this);
 	fDriverInterface->Disconnect();
 	fDriverInterface->ReleaseReference();