diff --git a/src/modules/everything/evry_gadget.c b/src/modules/everything/evry_gadget.c
index a59e5b301..101960f87 100644
--- a/src/modules/everything/evry_gadget.c
+++ b/src/modules/everything/evry_gadget.c
@@ -336,11 +336,11 @@ _gadget_popup_show(Instance *inst)
         break;
      }
 
-   if (px + pw > inst->win->zone->x + inst->win->zone->w)
-     x = inst->win->zone->w - pw;
+   if (x + pw > inst->win->zone->x + inst->win->zone->w)
+     x = inst->win->zone->x + inst->win->zone->w - pw;
 
-   if (py + ph > inst->win->zone->y + inst->win->zone->h)
-     y = inst->win->zone->h - ph;
+   if (y + ph > inst->win->zone->y + inst->win->zone->h)
+     y = inst->win->zone->y + inst->win->zone->h - ph;
 
    evas_object_move(ewin, x, y);
 }