diff --git a/include/devices.h b/include/devices.h
index 2bb18e4..3e6ccf6 100644
--- a/include/devices.h
+++ b/include/devices.h
@@ -94,6 +94,15 @@ namespace Devices {
                 }
             }).build()
         )
+        .addSecondary(
+            Builder<Button>::instance(new Button{"Display remaining timer", "display_remaining_timer",
+                [](const char* msg) {
+                    if (strcmp("PRESS", msg) == 0 && !Display::Timer::tDisplayTimer.isEnabled()) {
+                        Display::Timer::tDisplayTimer.restart();
+                    }
+                }
+            }).build()
+        )
         .addSecondary(
             Builder<Button>::instance(new Button{"Update time", "update_time",
                 [](const char* msg) {
diff --git a/include/display.h b/include/display.h
index 81579fa..93b9d20 100644
--- a/include/display.h
+++ b/include/display.h
@@ -89,6 +89,7 @@ namespace Display {
                 }
             }, &ts, false,
             []{
+                if (!tDisplayTime.isEnabled()) return false;
                 tDisplayTime.disable();
                 return true;
             },