diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 5b7943d7c0..d967b8d01c 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -10520,6 +10520,10 @@ gtk_widget_real_unmap (GtkWidget *widget)
         {
           gtk_widget_unmap (child);
         }
+
+      gtk_widget_unset_state_flags (widget,
+                                    GTK_STATE_FLAG_PRELIGHT |
+                                    GTK_STATE_FLAG_ACTIVE);
     }
 }