diff --git a/src/Akela/OneShot.cpp b/src/Akela/OneShot.cpp
index 3d22cfd8..eccf9bf2 100644
--- a/src/Akela/OneShot.cpp
+++ b/src/Akela/OneShot.cpp
@@ -179,6 +179,13 @@ namespace Akela {
             setSticky (idx);
 
             saveAsPrevious (mappedKey);
+          } else {
+            Timer = 0;
+
+            setOneShot (idx);
+            saveAsPrevious (mappedKey);
+
+            activateOneShot (idx);
           }
         }
       }