diff --git a/image_view/src/nodelets/image_nodelet.cpp b/image_view/src/nodelets/image_nodelet.cpp
index d83ff2aec..680558ff5 100644
--- a/image_view/src/nodelets/image_nodelet.cpp
+++ b/image_view/src/nodelets/image_nodelet.cpp
@@ -306,7 +306,7 @@ void ImageNodelet::windowThread()
   {
   }
 
-  cv::destroyWindow(window_name_);
+  cv::destroyAllWindows();
 
   pub_.shutdown();