diff --git a/src/kits/bluetooth/UI/ConnectionIncoming.cpp b/src/kits/bluetooth/UI/ConnectionIncoming.cpp
index c2865338c1..75857b41bd 100644
--- a/src/kits/bluetooth/UI/ConnectionIncoming.cpp
+++ b/src/kits/bluetooth/UI/ConnectionIncoming.cpp
@@ -46,7 +46,7 @@ void ConnectionView::Pulse()
 {
 	static int a = 0;
 	if (a++ == B_PULSES_BY_SECOND(5))
-		Window()->QuitRequested();
+		Window()->PostMessage(B_QUIT_REQUESTED);
 
 }
 
@@ -85,7 +85,7 @@ void ConnectionIncoming::MessageReceived(BMessage *message)
 //---------------------------------------------------------------
 bool ConnectionIncoming::QuitRequested()
 {
-	Quit();
+
 	return BWindow::QuitRequested();
 }
 
diff --git a/src/kits/bluetooth/UI/PincodeWindow.cpp b/src/kits/bluetooth/UI/PincodeWindow.cpp
index 15dab0b848..ed4cf53023 100644
--- a/src/kits/bluetooth/UI/PincodeWindow.cpp
+++ b/src/kits/bluetooth/UI/PincodeWindow.cpp
@@ -149,7 +149,7 @@ void PincodeWindow::MessageReceived(BMessage *msg)
 				// TODO: something failed here
 			}
 
-			QuitRequested();
+			PostMessage(B_QUIT_REQUESTED);
 		}
 		break;
 
@@ -179,7 +179,7 @@ void PincodeWindow::MessageReceived(BMessage *msg)
 				// TODO: something failed here
 			}
 
-			QuitRequested();
+			PostMessage(B_QUIT_REQUESTED);
 		}
 		break;
 
@@ -193,9 +193,7 @@ void PincodeWindow::MessageReceived(BMessage *msg)
 
 bool PincodeWindow::QuitRequested()
 {
-	Lock();
-	Quit();
-	return (true);
+	return BWindow::QuitRequested();
 };
 
 }