diff --git a/libs/draw.c b/libs/draw.c
index 476c1fb..e06fc1a 100644
--- a/libs/draw.c
+++ b/libs/draw.c
@@ -326,12 +326,12 @@ drawnumber(int x, int y, int w, int numberWidth, int modeWidth)
     if (!hidematchcount) { // draw match count
         drw_setscheme(drw, scheme[SchemeNumber]);
 
-        drw_text(drw, mw - numberWidth - modeWidth - 2 * sp, 0, numberWidth, bh, lrpad / 2 + plw / 2, numbers, 0, pango_numbers ? True : False);
+        drw_text(drw, mw - numberWidth - modeWidth - 2 * sp - 2 * borderwidth, 0, numberWidth, bh, lrpad / 2 + plw / 2, numbers, 0, pango_numbers ? True : False);
 
         // draw powerline for match count
         if (!hidepowerline) {
             drw_settrans(drw, scheme[SchemeNumber], scheme[SchemeMenu]);
-            drw_arrow(drw, mw - numberWidth - modeWidth - 2 * sp, 0, plw, bh, 0, 0);
+            drw_arrow(drw, mw - numberWidth - modeWidth - 2 * sp - 2 * borderwidth, 0, plw, bh, 0, 0);
 
             x += plw;
         }
@@ -346,12 +346,12 @@ drawmode(int x, int y, int w, int numberWidth, int modeWidth)
     if (!hidemode) { // draw mode indicator
         drw_setscheme(drw, scheme[SchemeMode]);
 
-        drw_text(drw, mw - modeWidth - 2 * sp, 0, modeWidth, bh, lrpad / 2 + plw / 2, modetext, 0, pango_mode ? True : False);
+        drw_text(drw, mw - modeWidth - 2 * sp - 2 * borderwidth, 0, modeWidth, bh, lrpad / 2 + plw / 2, modetext, 0, pango_mode ? True : False);
 
         // draw powerline for match count
         if (!hidepowerline) {
             drw_settrans(drw, scheme[SchemeMode], hidematchcount ? scheme[SchemeMenu] : scheme[SchemeNumber]);
-            drw_arrow(drw, mw - modeWidth - 2 * sp, 0, plw, bh, 0, 0);
+            drw_arrow(drw, mw - modeWidth - 2 * sp - 2 * borderwidth, 0, plw, bh, 0, 0);
 
             x += plw;
         }
diff --git a/spmenu.c b/spmenu.c
index e3e6174..ae41337 100644
--- a/spmenu.c
+++ b/spmenu.c
@@ -607,7 +607,7 @@ setupdisplay(void)
 	match(); // match entries
 
 	// create menu window and set properties for it
-    create_window(x + sp, y + vp - (menuposition == 2 ? 0 : borderwidth * 2), mw - 2 * sp - borderwidth * 2, mh);
+    create_window(x + sp, y + vp - (menuposition == 1 ? 0 : borderwidth * 2), mw - 2 * sp - borderwidth * 2, mh);
     set_window();
     set_prop();