diff --git a/gui/blanktimer.cpp b/gui/blanktimer.cpp
index d991d40..cf35f65 100644
--- a/gui/blanktimer.cpp
+++ b/gui/blanktimer.cpp
@@ -37,6 +37,7 @@
 #include <sstream>
 #include "pages.hpp"
 #include "blanktimer.hpp"
+#include "../data.hpp"
 extern "C" {
 #include "../common.h"
 #include "../recovery_ui.h"
@@ -46,7 +47,6 @@
 
 blanktimer::blanktimer(void) {
 	blanked = 0;
-	sleepTimer = 60;
 	orig_brightness = getBrightness();
 }
 
diff --git a/gui/gui.cpp b/gui/gui.cpp
index 4788fe0..f08d68b 100644
--- a/gui/gui.cpp
+++ b/gui/gui.cpp
@@ -185,9 +185,12 @@
 	0, lshift = 0, rshift = 0, key_repeat = 0;
   static struct timeval touchStart;
   HardwareKeyboard kb;
+  string seconds;
 
   //start screen timeout threads
   blankTimer.setTimerThread();
+  DataManager::GetValue("tw_screen_timeout_secs", seconds);
+  blankTimer.setTime(atoi(seconds.c_str()));
 
   for (;;)
 	{