1 files changed, 4 insertions, 4 deletions
diff --git a/src/templates/qquickabstractbutton.cpp b/src/templates/qquickabstractbutton.cpp
index 44fa30b1..071b4964 100644
--- a/src/templates/qquickabstractbutton.cpp
+++ b/src/templates/qquickabstractbutton.cpp
@@ -478,9 +478,9 @@ void QQuickAbstractButton::keyReleaseEvent(QKeyEvent *event)
     if (event->key() == Qt::Key_Space) {
         setPressed(false);
 
+        nextCheckState();
         emit released();
         emit clicked();
-        nextCheckState();
 
         if (d->autoRepeat)
             d->stopPressRepeat();
@@ -525,6 +525,9 @@ void QQuickAbstractButton::mouseReleaseEvent(QMouseEvent *event)
     bool wasPressed = d->pressed;
     setPressed(false);
 
+    if (contains(event->pos()))
+        nextCheckState();
+
     if (wasPressed) {
         emit released();
         if (!d->wasHeld)
@@ -533,9 +536,6 @@ void QQuickAbstractButton::mouseReleaseEvent(QMouseEvent *event)
         emit canceled();
     }
 
-    if (contains(event->pos()))
-        nextCheckState();
-
     if (d->autoRepeat)
         d->stopPressRepeat();
     else