diff --git a/src/Configmenu.cc b/src/Configmenu.cc
index a12ca5ad..413e0b25 100644
--- a/src/Configmenu.cc
+++ b/src/Configmenu.cc
@@ -356,16 +356,16 @@ void Configmenu::Placementmenu::itemSelected(int button, int index) {
   case BScreen::TopBottom:
     configmenu->screen.setColPlacementDirection(BScreen::TopBottom);
 
-    setItemSelected(5, True);
-    setItemSelected(6, False);
+    setItemSelected(6, True);
+    setItemSelected(7, False);
 
     break;
 
   case BScreen::BottomTop:
     configmenu->screen.setColPlacementDirection(BScreen::BottomTop);
 
-    setItemSelected(5, False);
-    setItemSelected(6, True);
+    setItemSelected(6, False);
+    setItemSelected(7, True);
 
     break;
   }
diff --git a/src/Workspace.cc b/src/Workspace.cc
index 5f8817cb..70b043c0 100644
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@@ -396,9 +396,14 @@ Point *Workspace::bestFitPlacement(const Size &win_size, const Rect &space)
       best = siter;
   }
 
-  if (best != NULL)
-    return new Point(best->origin());
-  else
+  if (best != NULL) {
+    Point *pt = new Point(best->origin());
+    if (screen.colPlacementDirection() != BScreen::TopBottom)
+      pt->setY(pt->y() + (best->h() - win_size.h()));
+    if (screen.rowPlacementDirection() != BScreen::LeftRight)
+      pt->setX(pt->x() + (best->w() - win_size.w()));
+    return pt;
+  } else
     return NULL; //fall back to cascade
 }