diff --git a/app/idle_tracking.cpp b/app/idle_tracking.cpp
index 73b8373..efe1f07 100644
--- a/app/idle_tracking.cpp
+++ b/app/idle_tracking.cpp
@@ -9,8 +9,7 @@
 #include <unistd.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
-#include <X11/extensions/scrnsaver.h>
-
+#include <X11/extensions/scrnsaver.h> // This can require libxss-dev to be installed
 
 int get_idle_time()
 {
diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp
index 5a4fafb..6b857c7 100644
--- a/app/mainwindow.cpp
+++ b/app/mainwindow.cpp
@@ -273,7 +273,7 @@ void MainWindow::onUpdateUI()
 
     ui->mSkipButton->setVisible(mPostponeCount > 0);
 
-    if (mAppConfig.idle_timeout != 0)
+    if (mAppConfig.idle_timeout != 0 && mTimer->isActive())
     {
         int idle_minutes = get_idle_time();
         if (idle_minutes >= mAppConfig.idle_timeout)