diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 613f33abf5..9b460e7a23 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -2371,8 +2371,8 @@ wxWindowGTK::~wxWindowGTK()
     // avoid problem with GTK+ 2.18 where a frozen window causes the whole
     // TLW to be frozen, and if the window is then destroyed, nothing ever
     // gets painted again
-    if (IsFrozen())
-        DoThaw();
+    while (IsFrozen())
+        Thaw();
 
     if (m_widget)
     {