--- Slim/Buttons/ScreenSaver.pm~	2008-12-20 01:28:49.000000000 +0000
+++ Slim/Buttons/ScreenSaver.pm	2008-12-31 14:06:17.000000000 +0000
@@ -135,8 +135,14 @@
 
 	} elsif ($saver eq 'nosaver' && $client->power()) {
 
-		# don't change modes when none (just dim) is the screensaver.
-	
+		if (Slim::Buttons::Common::mode($client) =~ m/^SCREENSAVER\./) {
+			# remove previous, now unwanted screensaver
+			Slim::Buttons::Common::popMode($client);
+		}
+		else { 
+                	# don't change modes when none (just dim) is the screensaver.
+		}
+
 	} elsif (Slim::Utils::Alarm->getCurrentAlarm($client) && $mode eq Slim::Utils::Alarm->alarmScreensaver) {
 
 		# don't change modes if the alarmclock has activated the datetime screensaver