diff --git a/tasmota/tasmota_xdrv_driver/xdrv_27_shutter.ino b/tasmota/tasmota_xdrv_driver/xdrv_27_shutter.ino
index 153a54f38..d92d82025 100644
--- a/tasmota/tasmota_xdrv_driver/xdrv_27_shutter.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_27_shutter.ino
@@ -853,6 +853,12 @@ void ShutterButtonHandler(void)
   }
 
   if (NOT_PRESSED == button) {
+    if (Shutter[shutter_index].direction && Button.hold_timer[button_index] > 0) {
+      XdrvMailbox.index = shutter_index +1;
+      XdrvMailbox.payload = XdrvMailbox.index;
+      //AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: Shtr%d, Button %d, hold %d, dir %d, index %d, payload %d"), shutter_index+1, button_index+1, Button.hold_timer[button_index],Shutter[shutter_index].direction,XdrvMailbox.index,XdrvMailbox.payload);
+      CmndShutterStop();
+    }
     Button.hold_timer[button_index] = 0;
   } else {
     Button.hold_timer[button_index]++;