diff --git a/enlightenment/src/modules/systray/e_mod_main.c b/enlightenment/src/modules/systray/e_mod_main.c

index 035344c..a3c1080 100644

--- a/enlightenment/src/modules/systray/e_mod_main.c

+++ b/enlightenment/src/modules/systray/e_mod_main.c

@@ -329,12 +329,13 @@ _systray_icon_add(Instance *inst, const Ecore_X_Window win)

    edje_object_part_geometry_get(inst->ui.gadget, _part_size,

                                  NULL, NULL, &w, &h);

+   sz = h;

    if (w > h)

      w = h;

    else

      h = w;

-   /* assuming systray must be on a shelf here */

+   if (inst->gcc->gadcon->shelf)

    switch (inst->gcc->gadcon->orient)

      {

       case E_GADCON_ORIENT_HORIZ: