diff --git a/src/renderer/src/components/navbar/Navbar.vue b/src/renderer/src/components/navbar/Navbar.vue
index e3b82a9..a779bd3 100644
--- a/src/renderer/src/components/navbar/Navbar.vue
+++ b/src/renderer/src/components/navbar/Navbar.vue
@@ -67,7 +67,7 @@
               <p>Idle Timeout:&nbsp;</p>
               <p>
                 {{
-                  deviceStore.settings?.idleTimeout
+                  deviceStore.settings?.idleTimeout !== 999999999
                     ? `${Math.round(deviceStore.settings.idleTimeout / 1000)}s`
                     : 'Off'
                 }}
diff --git a/src/renderer/src/deviceStore.ts b/src/renderer/src/deviceStore.ts
index 2ce3232..3ab4a0d 100644
--- a/src/renderer/src/deviceStore.ts
+++ b/src/renderer/src/deviceStore.ts
@@ -401,14 +401,14 @@ export const useDeviceStore = defineStore('device', {
       }
     },
     cycleIdleTimeout() {
-      if (this.settings!.idleTimeout === 0) {
+      if (this.settings!.idleTimeout === 999999999) {
         this.setIdleTimeout(10000)
       } else if (this.settings!.idleTimeout === 10000) {
         this.setIdleTimeout(30000)
       } else if (this.settings!.idleTimeout === 30000) {
         this.setIdleTimeout(60000)
       } else {
-        this.setIdleTimeout(0)
+        this.setIdleTimeout(999999999)
       }
     },
     setPosition(position: number) {