diff --git a/ChangeLog b/ChangeLog
index 37074ed71..1dbd5b185 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
-
 2013-01-10 Carsten Haitzler
 
         * fixed bug where starting with a nonexistent config could cause a crash instead of simply restarting
+        * fixed window border hide bug where after iconification hides leave ghosts
 
 2013-01-10 Mike Blumenkrantz
 
diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index f293864ff..16622f279 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -1091,17 +1091,16 @@ e_border_hide(E_Border *bd,
         switch (manage)
           {
            case 2: break;
-
            case 3:
              bd->hidden = 1;
-
            case 1:
-             /* Make sure that this border isn't deleted */
-             bd->await_hide_event++;
-
            default:
-             if (!e_manager_comp_evas_get(bd->zone->container->manager))
-               ecore_x_window_hide(bd->client.win);
+               if (!e_manager_comp_evas_get(bd->zone->container->manager))
+                 {
+                    /* Make sure that this border isn't deleted */
+                    bd->await_hide_event++;
+                    ecore_x_window_hide(bd->client.win);
+                 }
           }
      }