diff --git a/src/drawentity.cpp b/src/drawentity.cpp
index 6260f0dc..b8e3cbd5 100644
--- a/src/drawentity.cpp
+++ b/src/drawentity.cpp
@@ -615,7 +615,7 @@ void Entity::Draw(DrawAs how, Canvas *canvas) {
                     double w = 60 - camera.width  / 2.0;
                     // Shift the axis to the right if they would overlap with the toolbar.
                     if(SS.showToolbar) {
-                        if(h + 30 > -(34*16 + 3*16 + 8) / 2)
+                        if(h + 30 > -(32*18 + 3*16 + 8) / 2)
                             w += 60;
                     }
                     tail = camera.projRight.ScaledBy(w/s).Plus(
diff --git a/src/toolbar.cpp b/src/toolbar.cpp
index e6f76732..bf6b59c5 100644
--- a/src/toolbar.cpp
+++ b/src/toolbar.cpp
@@ -157,7 +157,7 @@ bool GraphicsWindow::ToolbarDrawOrHitTest(int mx, int my, UiCanvas *canvas,
 
     // When changing these values, also change the asReference drawing code in drawentity.cpp.
     int fudge = 8;
-    int h = 36*16 + 3*16 + fudge;
+    int h = 32*18 + 3*16 + fudge;
     int aleft = 0, aright = 66, atop = y+16+fudge/2, abot = y+16-h;
 
     bool withinToolbar =