diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt
index ea0f43dd76..5cdf4da6de 100644
--- a/Docs/Changelog_sm5.txt
+++ b/Docs/Changelog_sm5.txt
@@ -4,6 +4,14 @@ The StepMania 5 Changelog covers all post-sm-ssc changes. For a list of changes
 from StepMania 4 alpha 5 to sm-ssc v1.2.5, see Changelog_sm-ssc.txt.
 ________________________________________________________________________________
 
+2015/07/11
+----------
+* [ScreenMapControllers] If the AutoDismissWarningSecs metric is less than
+  .25 seconds, the warning will not be shown (the TweenOn command for it will
+  not be played).  Instead, the NeverShow command will be played.  If the
+  NeverShow command does not exist for the warning actor, the warning actor
+  will be set to hibernate forever. [kyzentun]
+
 2015/07/02
 ----------
 * [Gameplay] Random background video behavior is now controlled by these
diff --git a/src/ScreenMapControllers.cpp b/src/ScreenMapControllers.cpp
index a477a6afb0..0160c06640 100644
--- a/src/ScreenMapControllers.cpp
+++ b/src/ScreenMapControllers.cpp
@@ -227,7 +227,21 @@ void ScreenMapControllers::BeginScreen()
 	m_AutoDismissWarningSecs= THEME->GetMetricF(m_sName, "AutoDismissWarningSecs");
 	m_AutoDismissNoSetListPromptSecs= 0.0f;
 	m_AutoDismissSanitySecs= 0.0f;
-	m_Warning->PlayCommand("TweenOn");
+	if(m_AutoDismissWarningSecs > 0.25)
+	{
+		m_Warning->PlayCommand("TweenOn");
+	}
+	else
+	{
+		if(m_Warning->HasCommand("NeverShow"))
+		{
+			m_Warning->PlayCommand("NeverShow");
+		}
+		else
+		{
+			m_Warning->SetHibernate(16777216.0f);
+		}
+	}
 }