diff --git a/lib/python/Screens/Makefile.am b/lib/python/Screens/Makefile.am
index 0e8693785c4..ede99a78c9d 100644
--- a/lib/python/Screens/Makefile.am
+++ b/lib/python/Screens/Makefile.am
@@ -8,7 +8,7 @@ install_PYTHON = \
 	EpgSelection.py EventView.py Mute.py Standby.py ServiceInfo.py \
 	InfoBarGenerics.py HelpMenu.py Wizard.py __init__.py \
 	Dish.py LanguageSelection.py StartWizard.py PiPSetup.py \
-	PluginBrowser.py MinuteInput.py Scart.py PVRState.py \
+	PluginBrowser.py MinuteInput.py Scart.py \
 	Console.py InputBox.py ChoiceBox.py SimpleSummary.py \
 	TimerSelection.py PictureInPicture.py TimeDateInput.py \
 	SubtitleDisplay.py SubservicesQuickzap.py ParentalControlSetup.py NumericalTextInputHelpDialog.py \
diff --git a/lib/python/Screens/ScreenSaver.py b/lib/python/Screens/ScreenSaver.py
index 58efa83923a..84283a20702 100644
--- a/lib/python/Screens/ScreenSaver.py
+++ b/lib/python/Screens/ScreenSaver.py
@@ -48,8 +48,6 @@ def ScreenSaverTimerStart(self):
 	def screensaverTimeout(self):
 		if self.execing and not Screens.Standby.inStandby and not Screens.Standby.inTryQuitMainloop:
 			self.hide()
-			if hasattr(self, "pvrStateDialog"):
-				self.pvrStateDialog.hide()
 			self.screensaver.show()
 			eActionMap.getInstance().bindAction('', -maxint - 1, self.keypressScreenSaver)