diff --git a/src/client.c b/src/client.c
index b94139cd2a573da34d847c3fd6e03b3e3cfeab3c..0dd84acf6b69088c8d53ab5f80a8aca8cf43dc02 100644
--- a/src/client.c
+++ b/src/client.c
@@ -1781,7 +1781,6 @@ clientFrame (DisplayInfo *display_info, Window w, gboolean recapture)
     clientGrabKeys (c);
     clientGrabButtons(c);
 
-
     /* Initialize per client menu button pixmap */
     xfwmPixmapInit (screen_info, &c->appmenu[ACTIVE]);
     xfwmPixmapInit (screen_info, &c->appmenu[INACTIVE]);
@@ -1982,6 +1981,7 @@ clientUnframe (Client * c, gboolean remap)
     if (c->appicon)
     {
         g_object_unref(c->appicon);
+        c->appicon = NULL;
     }
 
     myDisplayUngrabServer (display_info);