diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index d0a6e46d72..3a752eb261 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -4423,6 +4423,7 @@ BodyHeight=38
 
 [ComboGraph]
 BodyWidth=140
+BodyHeight=11
 
 # Arcade #################################
 [ScreenLogo]
diff --git a/src/ComboGraph.cpp b/src/ComboGraph.cpp
index f7c745bdf5..e582f2a9fb 100644
--- a/src/ComboGraph.cpp
+++ b/src/ComboGraph.cpp
@@ -22,6 +22,11 @@ ComboGraph::ComboGraph()
 void ComboGraph::Load( RString sMetricsGroup )
 {
 	BODY_WIDTH.Load( sMetricsGroup, "BodyWidth" );
+	BODY_HEIGHT.Load( sMetricsGroup, "BodyHeight" );
+
+	// These need to be set so that a theme can use zoomtowidth/zoomtoheight and get correct behavior.
+	this->SetWidth(BODY_WIDTH);
+	this->SetHeight(BODY_HEIGHT);
 
 	Actor *pActor = NULL;
 
@@ -29,6 +34,7 @@ void ComboGraph::Load( RString sMetricsGroup )
 	if( m_pBacking != NULL )
 	{
 		m_pBacking->ZoomToWidth( BODY_WIDTH );
+		m_pBacking->ZoomToHeight( BODY_HEIGHT );
 		this->AddChild( m_pBacking );
 	}
 
@@ -36,6 +42,7 @@ void ComboGraph::Load( RString sMetricsGroup )
 	if( m_pNormalCombo != NULL )
 	{
 		m_pNormalCombo->ZoomToWidth( BODY_WIDTH );
+		m_pNormalCombo->ZoomToHeight( BODY_HEIGHT );
 		this->AddChild( m_pNormalCombo );
 	}
 
@@ -43,6 +50,7 @@ void ComboGraph::Load( RString sMetricsGroup )
 	if( m_pMaxCombo != NULL )
 	{
 		m_pMaxCombo->ZoomToWidth( BODY_WIDTH );
+		m_pMaxCombo->ZoomToHeight( BODY_HEIGHT );
 		this->AddChild( m_pMaxCombo );
 	}
 
diff --git a/src/ComboGraph.h b/src/ComboGraph.h
index b679c7043b..492d13bfd9 100644
--- a/src/ComboGraph.h
+++ b/src/ComboGraph.h
@@ -24,6 +24,7 @@ public:
 
 private:
 	ThemeMetric<float> BODY_WIDTH;
+	ThemeMetric<float> BODY_HEIGHT;
 	Actor *m_pBacking;
 	Actor *m_pNormalCombo;
 	Actor *m_pMaxCombo;