diff --git a/bundles/org.openhab.ui/web/src/components/widgets/system/oh-stepper.vue b/bundles/org.openhab.ui/web/src/components/widgets/system/oh-stepper.vue
index 370442f566..765e218f31 100644
--- a/bundles/org.openhab.ui/web/src/components/widgets/system/oh-stepper.vue
+++ b/bundles/org.openhab.ui/web/src/components/widgets/system/oh-stepper.vue
@@ -1,6 +1,6 @@
 <template>
-  <f7-stepper ref="stepper" v-bind="config" :value="value" @stepper:change="onChange" @click.native.stop
-              :input="config.enableInput === true" :manual-input-mode="false" :format-value="formatValue" />
+  <f7-stepper ref="stepper" v-bind="config" @stepper:plusclick="onPlusMinusClick" @stepper:minusclick="onPlusMinusClick" @input="onInput"
+              :input="config.enableInput === true" :manual-input-mode="true" :format-value="formatValue" />
 </template>
 
 <style lang="stylus">
@@ -18,6 +18,7 @@ export default {
   widget: OhStepperDefinition,
   mounted () {
     delete this.config.value
+    this.$refs.stepper.setValue(this.value)
   },
   computed: {
     value () {
@@ -50,7 +51,20 @@ export default {
       const nbDecimals = Number(this.config.step).toString().replace(',', '.').split('.')[1]
       return parseFloat(Number(value)).toFixed(nbDecimals.length)
     },
-    onChange (value) {
+    onPlusMinusClick () {
+      setTimeout(() => {
+        this.sendCommand(this.$refs.stepper.getValue())
+      }, 10)
+    },
+    onInput () {
+      if (!this.config.enableInput) return
+      setTimeout(() => {
+        const newValue = this.$refs.stepper.getValue()
+        if (Math.abs(newValue - this.value) < (this.config.step || 1)) return
+        this.sendCommand(newValue)
+      }, 1500)
+    },
+    sendCommand (value) {
       const applyOffset = (value) => (typeof this.config.offset === 'number') ? Number(this.toStepFixed(value - this.config.offset)) : value
       let newValue = applyOffset(Number(this.toStepFixed(value)))
       if (newValue === this.value) return