diff --git a/lib/awful/placement.lua.in b/lib/awful/placement.lua.in
index d334f7fc..275416e0 100644
--- a/lib/awful/placement.lua.in
+++ b/lib/awful/placement.lua.in
@@ -113,13 +113,15 @@ function placement.no_offscreen(c)
 
     if geometry.x + geometry.width + 2*border > screen_geometry.x + screen_geometry.width then
         geometry.x = screen_geometry.x + screen_geometry.width - geometry.width - 2*border
-    elseif geometry.x < screen_geometry.x then
+    end
+    if geometry.x < screen_geometry.x then
         geometry.x = screen_geometry.x
     end
 
     if geometry.y + geometry.height + border > screen_geometry.y + screen_geometry.height then
         geometry.y = screen_geometry.y + screen_geometry.height - geometry.height - 2*border
-    elseif geometry.y < screen_geometry.y then
+    end
+    if geometry.y < screen_geometry.y then
         geometry.y = screen_geometry.y
     end