diff --git a/app/config.h b/app/config.h
index c8aa070..f886fce 100644
--- a/app/config.h
+++ b/app/config.h
@@ -4,7 +4,7 @@
 // App version
 #define QBREAK_VERSION_MAJOR    0
 #define QBREAK_VERSION_MINOR    1
-#define QBREAK_VERSION_SUFFIX   1
+#define QBREAK_VERSION_SUFFIX   2
 
 // How often UI is updated - interval in seconds
 #define INTERVAL_UPDATE_UI          (60)
diff --git a/app/idle_tracking.cpp b/app/idle_tracking.cpp
index b990dd1..acb45dd 100644
--- a/app/idle_tracking.cpp
+++ b/app/idle_tracking.cpp
@@ -212,10 +212,11 @@ int get_idle_time_kde_wayland()
 
 int get_idle_time_dynamically()
 {
-#if defined(USE_WAYLAND)
     const char* wl_display = std::getenv("WAYLAND_DISPLAY");
-    const char* x11_display = std::getenv("DISPLAY");
-    if (wl_display && !x11_display)
+    // const char* x11_display = std::getenv("DISPLAY");
+
+#if defined(USE_WAYLAND)
+    if (wl_display)
     {
         const char* desktop_name = std::getenv("XDG_SESSION_DESKTOP");
         if (!desktop_name)
@@ -233,6 +234,9 @@ int get_idle_time_dynamically()
         return get_idle_time_x11();
 #else
     // Restrict to X11
+    if (wl_display)
+        return 0;
+
     return get_idle_time_x11();
 #endif
 }
diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp
index d76537d..0f9dc26 100644
--- a/app/mainwindow.cpp
+++ b/app/mainwindow.cpp
@@ -254,6 +254,12 @@ void MainWindow::createTrayIcon()
     mTrayIcon->show();
 }
 
+static int msec2min(int msec)
+{
+    float min_f = float(msec) / 1000 / 60;
+    return (int)(min_f + 0.5f);
+}
+
 void MainWindow::onUpdateUI()
 {
     if (mAppConfig.idle_timeout != 0 && mTimer->isActive())
@@ -279,8 +285,8 @@ void MainWindow::onUpdateUI()
 
             mLastIdleMilliseconds = idle_milliseconds;
 
-            // qDebug() << "Increase remaining time from " << remaining_milliseconds << " by " << delta_idle_milliseconds << ". "
-            //          << "New remaining time " << mTimer->remainingTime();
+            qDebug() << "Increase remaining time from " << remaining_milliseconds << " by " << delta_idle_milliseconds << ". "
+                      << "New remaining time " << mTimer->remainingTime() << ". Idle in milliseconds " << idle_milliseconds;
         }
         else
             mLastIdleMilliseconds = 0;
@@ -297,10 +303,10 @@ void MainWindow::onUpdateUI()
         if (mTimer->isActive())
         {
             auto remaining_milliseconds = mTimer->remainingTime();
-            if (remaining_milliseconds == 0)
+            if (remaining_milliseconds < 60000)
                 mTrayIcon->setToolTip(tr("Less than a minute left until the next break."));
             else
-                mTrayIcon->setToolTip(tr("There are %1 minutes left until the next break.").arg(remaining_milliseconds / 1000 / 60));
+                mTrayIcon->setToolTip(tr("There are %1 minutes left until the next break.").arg(msec2min(remaining_milliseconds)));
         }
     }