diff --git a/src/bin/desklink/VolumeControl.cpp b/src/bin/desklink/VolumeControl.cpp
index f4bb019511..41cd320ccd 100644
--- a/src/bin/desklink/VolumeControl.cpp
+++ b/src/bin/desklink/VolumeControl.cpp
@@ -78,6 +78,8 @@ VolumeControl::VolumeControl(BMessage* archive)
 		volumeWhich = VOLUME_USE_MIXER;
 
 	fMixerControl = new MixerControl(volumeWhich);
+
+	archive->SendReply(new BMessage(B_QUIT_REQUESTED));
 }
 
 
@@ -329,6 +331,10 @@ VolumeControl::MessageReceived(BMessage* msg)
 			break;
 		}
 
+		case B_QUIT_REQUESTED:
+			Window()->MessageReceived(msg);
+			break;
+
 		case kMsgReconnectVolume:
 			_ConnectVolume();
 			if (!fMixerControl->Connected() && --fConnectRetries > 1) {
diff --git a/src/bin/desklink/VolumeWindow.cpp b/src/bin/desklink/VolumeWindow.cpp
index 9b4d4baf5b..ae99ba0771 100644
--- a/src/bin/desklink/VolumeWindow.cpp
+++ b/src/bin/desklink/VolumeWindow.cpp
@@ -86,6 +86,10 @@ VolumeWindow::MessageReceived(BMessage *msg)
 			} else
 				Quit();
 			break;
+		
+		case B_QUIT_REQUESTED:
+			Quit();
+			break;
 
 		default:
 			BWindow::MessageReceived(msg);