diff --git a/src/modules/illume2/e_mod_border.c b/src/modules/illume2/e_mod_border.c
index f3fff9b7d..b8e918763 100644
--- a/src/modules/illume2/e_mod_border.c
+++ b/src/modules/illume2/e_mod_border.c
@@ -219,6 +219,12 @@ e_mod_border_is_conformant(E_Border *bd)
    return ecore_x_e_illume_conformant_get(bd->client.win);
 }
 
+Eina_Bool 
+e_mod_border_is_quickpanel(E_Border *bd) 
+{
+   return ecore_x_e_illume_quickpanel_get(bd->client.win);
+}
+
 Eina_List *
 e_mod_border_valid_borders_get(E_Zone *zone) 
 {
diff --git a/src/modules/illume2/e_mod_border.h b/src/modules/illume2/e_mod_border.h
index c1740aca6..96371ae66 100644
--- a/src/modules/illume2/e_mod_border.h
+++ b/src/modules/illume2/e_mod_border.h
@@ -25,6 +25,7 @@ Eina_Bool e_mod_border_is_side_pane_left(E_Border *bd);
 Eina_Bool e_mod_border_is_side_pane_right(E_Border *bd);
 Eina_Bool e_mod_border_is_overlay(E_Border *bd);
 Eina_Bool e_mod_border_is_conformant(E_Border *bd);
+Eina_Bool e_mod_border_is_quickpanel(E_Border *bd);
 
 Eina_List *e_mod_border_valid_borders_get(E_Zone *zone);
 E_Border *e_mod_border_valid_border_get(E_Zone *zone);
diff --git a/src/modules/illume2/e_mod_layout_illume.c b/src/modules/illume2/e_mod_layout_illume.c
index 82cc9dc64..77638a204 100644
--- a/src/modules/illume2/e_mod_layout_illume.c
+++ b/src/modules/illume2/e_mod_layout_illume.c
@@ -8,12 +8,12 @@
 
 /* define some values here for easily changing layers so we don't have to 
  * grep through code to change layers */
-#define IL_TOP_SHELF_LAYER 180
+#define IL_TOP_SHELF_LAYER 200
 #define IL_BOTTOM_PANEL_LAYER 100
 #define IL_KEYBOARD_LAYER 150
 #define IL_DIALOG_LAYER 120
 #define IL_CONFORM_LAYER 140
-#define IL_FULLSCREEN_LAYER 200
+#define IL_FULLSCREEN_LAYER 140
 #define IL_QUICK_PANEL_LAYER 160
 #define IL_APP_LAYER 100
 
@@ -334,6 +334,15 @@ _zone_layout(E_Zone *z)
              if (bd->layer != IL_DIALOG_LAYER) 
                e_border_layer_set(bd, IL_DIALOG_LAYER);
           }
+        else if (e_mod_border_is_quickpanel(bd)) 
+          {
+             int mw, mh;
+
+             printf("Found Quickpanel Window: %s\n", bd->client.icccm.class);
+             e_mod_border_min_get(bd, &mw, &mh);
+             if (bd->layer != IL_QUICK_PANEL_LAYER)
+               e_border_layer_set(bd, IL_QUICK_PANEL_LAYER);
+          }
         else 
           {
              if (e_mod_border_is_conformant(bd))