diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index b88b30a84e..907d6687c3 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -2877,8 +2877,8 @@ AutoDismissSanitySecs=5
 #
 # The position of the Devices list and its On/Off commands.
 DevicesX=SCREEN_CENTER_X
-DevicesY=SCREEN_TOP+24
-DevicesOnCommand=zoom,0.75;draworder,5;strokecolor,color("0,0,0,1")
+DevicesY=SCREEN_TOP+4
+DevicesOnCommand=vertalign,top;maxheight,92;zoom,0.75;draworder,5;strokecolor,color("0,0,0,1")
 DevicesOffCommand=
 #
 # The ListHeader parts are the row that the player's cursor starts on with
diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini
index 437db8099b..ce5e22ca04 100644
--- a/Themes/default/metrics.ini
+++ b/Themes/default/metrics.ini
@@ -157,7 +157,7 @@ TitleGainFocusCommand=stoptweening;zoom,0.6375*1.125;bounceend,0.1;diffuse,Color
 TitleLoseFocusCommand=diffuse,Color("White");strokecolor,Color("Black");stopeffect;
 #
 ItemsStartX=SCREEN_CENTER_X-140
-ItemsEndX=SCREEN_CENTER_X+130
+ItemsEndX=SCREEN_CENTER_X+80
 ItemsGapX=12
 ItemsMinBaseZoom=0.5
 ItemsLongRowP1X=SCREEN_CENTER_X-60
diff --git a/src/ScreenOptionsManageProfiles.cpp b/src/ScreenOptionsManageProfiles.cpp
index f80665135b..c508b5c547 100644
--- a/src/ScreenOptionsManageProfiles.cpp
+++ b/src/ScreenOptionsManageProfiles.cpp
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "ScreenDimensions.h"
 #include "ScreenOptionsManageProfiles.h"
 #include "ScreenManager.h"
 #include "RageLog.h"
@@ -454,7 +455,7 @@ void ScreenOptionsManageProfiles::ProcessMenuStart( const InputEventPlus & )
 		int iWidth, iX, iY;
 		this->GetWidthXY( PLAYER_1, iCurRow, 0, iWidth, iX, iY );
 
-		ScreenMiniMenu::MiniMenu( &g_TempMenu, SM_BackFromContextMenu, SM_BackFromContextMenu, (float)iX, (float)iY );
+		ScreenMiniMenu::MiniMenu( &g_TempMenu, SM_BackFromContextMenu, SM_BackFromContextMenu, (float)iX, SCREEN_CENTER_Y );
 	}
 }