--- a/skin.pm3-hd/720p/DialogButtonMenu.xml
+++ b/skin.pm3-hd/720p/DialogButtonMenu.xml
@@ -76,6 +76,7 @@
 				<pulseonselect>no</pulseonselect>
 				<font>-</font>
 				<label>$LOCALIZE[13012] XBMC</label>
+				<visible>System.ShowExitButton</visible>
 			</control>
 			<control type="group" id="14">
 				<width>80</width>
@@ -264,7 +265,7 @@
 				<pulseonselect>no</pulseonselect>
 				<font>-</font>
 				<label>$LOCALIZE[13391] $LOCALIZE[155]</label>
-				<visible>System.Loggedon</visible>
+				<visible>System.Loggedon + System.HasMediaDVD</visible>
 			</control>
 		</control>
 		<control type="image" id="0">