diff --git a/app/src/main/java/com/ericsson/uecontrol/gui/MainActivity.java b/app/src/main/java/com/ericsson/uecontrol/gui/MainActivity.java
index 486cff6..e5181e2 100755
--- a/app/src/main/java/com/ericsson/uecontrol/gui/MainActivity.java
+++ b/app/src/main/java/com/ericsson/uecontrol/gui/MainActivity.java
@@ -13,6 +13,7 @@ import android.preference.PreferenceManager;
 import android.support.v4.app.FragmentActivity;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.WindowManager;
 import android.widget.Toast;
 
 import com.ericsson.uecontrol.R;
@@ -187,11 +188,17 @@ public class MainActivity extends FragmentActivity implements OnSharedPreference
     }
 
     private void updateExecutionState(){
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
         if(action_execute != null) {
-            if (currentExecutor.isRunning())
+            if (currentExecutor.isRunning()) {
                 action_execute.setTitle(R.string.action_stop);
-            else
+                if(prefs.getBoolean("screen_on", false))
+                    getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+            }
+            else {
                 action_execute.setTitle(R.string.action_run);
+                getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+            }
         }
     }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4d7d4c8..f4f6047 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -29,5 +29,7 @@
     <string name="pref_debug">Debug Logging</string>
     <string name="pref_debug_summ">Enable application debug logging</string>
     <string name="action_reset">Reset</string>
+    <string name="pref_screen_on_summ">Keep screen on while execution</string>
+    <string name="pref_screen_on">Keep Screen On</string>
 
 </resources>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 9d4f9bb..fe41e7b 100755
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -14,6 +14,12 @@
             android:title="@string/pref_logging_path"
             android:summary="@string/pref_logging_path_summ"
             android:defaultValue="/sdcard/uecontrol/" />
+
+        <CheckBoxPreference
+            android:key="screen_on"
+            android:title="@string/pref_screen_on"
+            android:summary="@string/pref_screen_on_summ"
+            android:defaultValue="false" />
     </PreferenceCategory>
 
     <PreferenceCategory