diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index 2504fb93e..79a009e1b 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -2186,7 +2186,7 @@ e_border_focus_set(E_Border *bd,
    /* dont focus an iconified window. that's silly! */
    if (focus)
      {
-        if (bd->iconic)
+        if ((bd->iconic) && (!bd->deskshow))
           {
              e_border_uniconify(bd);
              if (!focus_track_frozen)
diff --git a/src/bin/e_desk.c b/src/bin/e_desk.c
index b9bedc965..c86659ca9 100644
--- a/src/bin/e_desk.c
+++ b/src/bin/e_desk.c
@@ -370,16 +370,19 @@ e_desk_deskshow(E_Zone *zone)
           {
              if (desk->deskshow_toggle)
                {
-                  if (bd->deskshow) e_border_uniconify(bd);
-                  bd->deskshow = 0;
+                  if (bd->deskshow)
+                    {
+                        bd->deskshow = 0;
+                        e_border_uniconify(bd);
+                    }
                }
              else
                {
                   if (bd->iconic) continue;
                   if (bd->client.netwm.state.skip_taskbar) continue;
                   if (bd->user_skip_winlist) continue;
-                  e_border_iconify(bd);
                   bd->deskshow = 1;
+                  e_border_iconify(bd);
                }
           }
      }