diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt
index dd889add2c..69fe93244b 100644
--- a/Docs/Changelog_sm5.txt
+++ b/Docs/Changelog_sm5.txt
@@ -13,6 +13,8 @@ StepMania 5.0 $next | 20111xxx
 * [Song] Fixed a bug where a sample start of 0 wouldn't work. [AJ]
 * [Game] Added CountNotesSeparately and GetMapJudgmentTo(TapNoteScore)
   Lua bindings. [AJ]
+* [StepMania.cpp] Fix initial aspect ratio on first boot, hopefully.
+  (See issues 6 and 27) [AJ]
 
 2011/12/22
 ----------
diff --git a/src/StepMania.cpp b/src/StepMania.cpp
index c02a934fa4..9f8c538dc6 100644
--- a/src/StepMania.cpp
+++ b/src/StepMania.cpp
@@ -661,7 +661,10 @@ found_defaults:
 		PREFSMAN->m_iMovieColorDepth.Set( defaults.iMovieColor );
 		PREFSMAN->m_iMaxTextureResolution.Set( defaults.iTextureSize );
 		PREFSMAN->m_bSmoothLines.Set( defaults.bSmoothLines );
-		PREFSMAN->m_fDisplayAspectRatio.Set( HOOKS->GetDisplayAspectRatio() );
+		// this only worked when we started in fullscreen by default. -aj
+		//PREFSMAN->m_fDisplayAspectRatio.Set( HOOKS->GetDisplayAspectRatio() );
+		// now that we start in windowed mode, use the new default aspect ratio.
+		PREFSMAN->m_fDisplayAspectRatio.Set( PREFSMAN->m_fDisplayAspectRatio );
 
 		// Update last seen video card
 		PREFSMAN->m_sLastSeenVideoDriver.Set( GetVideoDriverName() );