diff --git a/WallPanelApp/build.gradle b/WallPanelApp/build.gradle
index c1bdbd4..29c9a31 100644
--- a/WallPanelApp/build.gradle
+++ b/WallPanelApp/build.gradle
@@ -28,7 +28,7 @@ repositories {
 def versionMajor = 0
 def versionMinor = 8
 def versionPatch = 5
-def versionBuild = 4 // bump for dog food builds, public betas, etc.
+def versionBuild = 5 // bump for dog food builds, public betas, etc.
 
 android {
     kapt {
diff --git a/WallPanelApp/src/main/java/com/thanksmister/iot/wallpanel/ui/activities/BrowserActivity.kt b/WallPanelApp/src/main/java/com/thanksmister/iot/wallpanel/ui/activities/BrowserActivity.kt
index 892c41c..06d463e 100644
--- a/WallPanelApp/src/main/java/com/thanksmister/iot/wallpanel/ui/activities/BrowserActivity.kt
+++ b/WallPanelApp/src/main/java/com/thanksmister/iot/wallpanel/ui/activities/BrowserActivity.kt
@@ -109,11 +109,13 @@ abstract class BrowserActivity : DaggerAppCompatActivity() {
         if(configuration.cameraEnabled || configuration.hasCameraDetections() && Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP_MR1) {
             window.setFlags(WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED, WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED)
         }
-
+        Timber.d("Prevent Sleep ${configuration.appPreventSleep}")
         if (configuration.appPreventSleep) {
-            window.addFlags( WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON )
+            window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON )
+            decorView?.keepScreenOn = true
         } else {
             window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+            decorView?.keepScreenOn = false
         }
 
         lifecycle.addObserver(dialogUtils)