diff --git a/src/haiku_support.cc b/src/haiku_support.cc
index 6a270d338a2..e1aaf835689 100644
--- a/src/haiku_support.cc
+++ b/src/haiku_support.cc
@@ -739,7 +739,7 @@ class EmacsWindow : public BWindow
 	was_shown_p = true;
       }
 
-    if (this->parent)
+    if (this->parent && offscreen_draw_view)
       shown_flag = 1;
     Show ();
     if (this->parent)
@@ -994,6 +994,8 @@ class EmacsView : public BView
 	offscreen_draw_view = NULL;
 	delete offscreen_draw_bitmap_1;
 	offscreen_draw_bitmap_1 = NULL;
+
+	shown_flag = 0;
       }
    }