diff --git a/spectrum/src/main.cpp b/spectrum/src/main.cpp
index 21f6a1c44626006eaea158207ac9aeda34f9abc2..68389e80864536d4e29cb08ee9b9b6be598ad27c 100644
--- a/spectrum/src/main.cpp
+++ b/spectrum/src/main.cpp
@@ -47,12 +47,6 @@ Component *component_ = NULL;
 UserManager *userManager_ = NULL;
 Config *config_ = NULL;
 
-void stop() {
-	userManager_->removeAllUsers(false);
-	component_->stop();
-	eventLoop_->stop();
-}
-
 static void stop_spectrum() {
 	userManager_->removeAllUsers(false);
 	component_->stop();
@@ -67,6 +61,16 @@ static void spectrum_sigterm_handler(int sig) {
 	eventLoop_->postEvent(&stop_spectrum);
 }
 
+#ifdef WIN32
+BOOL spectrum_control_handler( DWORD fdwCtrlType ) { 
+	if (fdwCtrlType == CTRL_C_EVENT || fdwCtrlType == CTRL_CLOSE_EVENT) {
+		eventLoop_->postEvent(&stop_spectrum);
+		return TRUE;
+	}
+	return FALSE;
+} 
+#endif
+
 static void removeOldIcons(std::string iconDir) {
 	std::vector<std::string> dirs;
 	dirs.push_back(iconDir);
@@ -126,7 +130,6 @@ static void daemonize(const char *cwd, const char *lock_file) {
 		exit(1);
 	}
 }
-
 #endif
 
 int mainloop() {
@@ -291,6 +294,12 @@ int main(int argc, char **argv)
 		std::cout << "SIGTERM handler can't be set\n";
 		return -1;
 	}
+#else
+	if( !SetConsoleCtrlHandler( (PHANDLER_ROUTINE) spectrum_control_handler, TRUE ) ) 
+	{ 
+		std::cout << "control handler can't be set\n";
+		return -1;
+	} 
 #endif
 	boost::program_options::options_description desc(std::string("Spectrum version: ") + SPECTRUM_VERSION + "\nUsage: spectrum [OPTIONS] <config_file.cfg>\nAllowed options");
 	desc.add_options()
diff --git a/spectrum/src/win32/ServiceWrapper.cpp b/spectrum/src/win32/ServiceWrapper.cpp
index ad8c6a1a2830aff439a4870760d999ec5d4a4aba..fc5df08b54295cb985ad0f91a8e3c0f0fd819104 100644
--- a/spectrum/src/win32/ServiceWrapper.cpp
+++ b/spectrum/src/win32/ServiceWrapper.cpp
@@ -87,7 +87,7 @@ void WINAPI ServiceControlHandler(DWORD controlCode) {
 		break;
 	}
 	SetServiceStatus(ServiceStatusHandle, &ServiceStatus);	
-	stop();
+	spectrum_control_handler(CTRL_CLOSE_EVENT);
 }
 
 void WINAPI ServiceMain(DWORD argc, LPSTR *argv) {
diff --git a/spectrum/src/win32/ServiceWrapper.h b/spectrum/src/win32/ServiceWrapper.h
index 9ee2fb0def5d8e0284934cda18387f6b832dad05..aa6bce4116037fb6d7a18089751c70ba98d7d963 100644
--- a/spectrum/src/win32/ServiceWrapper.h
+++ b/spectrum/src/win32/ServiceWrapper.h
@@ -15,5 +15,5 @@ public:
 };
 
 int mainloop();
-void stop();
+BOOL spectrum_control_handler( DWORD fdwCtrlType );