diff --git a/src/servers/keystore/AppAccessRequestWindow.cpp b/src/servers/keystore/AppAccessRequestWindow.cpp
index b4edf58263..dc77e4ce0a 100644
--- a/src/servers/keystore/AppAccessRequestWindow.cpp
+++ b/src/servers/keystore/AppAccessRequestWindow.cpp
@@ -176,6 +176,15 @@ AppAccessRequestWindow::~AppAccessRequestWindow()
 }
 
 
+bool
+AppAccessRequestWindow::QuitRequested()
+{
+	fResult = kMessageDisallow;
+	release_sem(fDoneSem);
+	return false;
+}
+
+
 void
 AppAccessRequestWindow::MessageReceived(BMessage* message)
 {
diff --git a/src/servers/keystore/AppAccessRequestWindow.h b/src/servers/keystore/AppAccessRequestWindow.h
index d8f952a1d2..b1b8b1a030 100644
--- a/src/servers/keystore/AppAccessRequestWindow.h
+++ b/src/servers/keystore/AppAccessRequestWindow.h
@@ -23,6 +23,7 @@ public:
 										bool appWasUpdated);
 virtual								~AppAccessRequestWindow();
 
+virtual	bool						QuitRequested();
 virtual	void						MessageReceived(BMessage* message);
 
 		status_t					RequestAppAccess(bool& allowAlways);
diff --git a/src/servers/keystore/KeyRequestWindow.cpp b/src/servers/keystore/KeyRequestWindow.cpp
index bbad08d2f3..6d93408d58 100644
--- a/src/servers/keystore/KeyRequestWindow.cpp
+++ b/src/servers/keystore/KeyRequestWindow.cpp
@@ -185,6 +185,15 @@ KeyRequestWindow::~KeyRequestWindow()
 }
 
 
+bool
+KeyRequestWindow::QuitRequested()
+{
+	fResult = B_CANCELED;
+	release_sem(fDoneSem);
+	return false;
+}
+
+
 void
 KeyRequestWindow::MessageReceived(BMessage* message)
 {
diff --git a/src/servers/keystore/KeyRequestWindow.h b/src/servers/keystore/KeyRequestWindow.h
index a9336abb9e..2301aaa06b 100644
--- a/src/servers/keystore/KeyRequestWindow.h
+++ b/src/servers/keystore/KeyRequestWindow.h
@@ -18,6 +18,7 @@ public:
 									KeyRequestWindow();
 virtual								~KeyRequestWindow();
 
+virtual	bool						QuitRequested();
 virtual	void						MessageReceived(BMessage* message);
 
 		status_t					RequestKey(const BString& keyringName,