diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 11ccac36..fa07b3fa 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -82,6 +82,11 @@
 			android:entries="@array/KeyguardPreferenceEntries"
 			android:entryValues="@array/KeyguardPreferenceValues"
 			android:defaultValue="0" />
+		<CheckBoxPreference 
+		    android:key="setting_keep_screen_on"
+		    android:title="Keep Screen On"
+		    android:summary="Prevent the screen from turning off while app is running"
+		    android:defaultValue="false"/>
 	</PreferenceCategory>
 	<PreferenceCategory android:title="Miscellaneous options">
 		<CheckBoxPreference
diff --git a/src/org/xbmc/android/remote/presentation/activity/ConfigurationManager.java b/src/org/xbmc/android/remote/presentation/activity/ConfigurationManager.java
index de17723a..5519c661 100644
--- a/src/org/xbmc/android/remote/presentation/activity/ConfigurationManager.java
+++ b/src/org/xbmc/android/remote/presentation/activity/ConfigurationManager.java
@@ -32,6 +32,7 @@
 class ConfigurationManager implements OnSharedPreferenceChangeListener {
 
 	public final static String PREF_KEYGUARD_DISABLED = "setting_disable_keyguard";
+	public final static String PREF_KEEP_SCREEN_ON = "setting_keep_screen_on";
 
 	public final static String KEYGUARD_STATUS_ENABLED = "0";
 	public final static String KEYGUARD_STATUS_REMOTE_ONLY = "1";
@@ -49,6 +50,8 @@ class ConfigurationManager implements OnSharedPreferenceChangeListener {
 
 	private int mKeyguardState = 0;
 	
+	private boolean mKeepScreenOn = false;
+	
 	private KeyguardManager.KeyguardLock mKeyguardLock = null;
 
 	private ConfigurationManager(Activity activity) {
@@ -56,6 +59,7 @@ private ConfigurationManager(Activity activity) {
 		final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mActivity);
 		prefs.registerOnSharedPreferenceChangeListener(this);
 		mKeyguardState = Integer.parseInt(prefs.getString(PREF_KEYGUARD_DISABLED, KEYGUARD_STATUS_ENABLED));
+		mKeepScreenOn = prefs.getBoolean(PREF_KEEP_SCREEN_ON, false);
 	}
 
 	public static ConfigurationManager getInstance(Activity activity) {
@@ -103,6 +107,9 @@ public void onSharedPreferenceChanged(SharedPreferences prefs, String key) {
 			else
 				enableKeyguard();
 		}
+		else if (key.equals(PREF_KEEP_SCREEN_ON)) {
+			mKeepScreenOn = prefs.getBoolean(PREF_KEEP_SCREEN_ON, false);
+		}
 	}
 	
 	public void onActivityResume(Activity activity) {
@@ -121,6 +128,10 @@ public void onActivityResume(Activity activity) {
 				break;
 		}
 		
+		if (mKeepScreenOn) {
+			activity.getWindow().addFlags(android.view.WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+		}
+		
 		activity.setVolumeControlStream(AudioManager.STREAM_MUSIC);
 		mActivity = activity;
 	}