diff --git a/src/misc_utilities/calibrate.cpp b/src/misc_utilities/calibrate.cpp
index 0175ecc..392a13a 100644
--- a/src/misc_utilities/calibrate.cpp
+++ b/src/misc_utilities/calibrate.cpp
@@ -373,8 +373,7 @@ int main(int argc, char** argv) {
 
   drawImage(imgOriginal);
 
-  
-  while (true)
+  while (cvGetWindowHandle(WINDOW_NAME.c_str()) != 0)
   {
 
     char c = waitKey(15);
@@ -387,6 +386,7 @@ int main(int argc, char** argv) {
       cout << "prewarp = " << get_config() << endl;
       break;
     }
+
   }
 
   cvDestroyAllWindows();