diff --git a/src/widget/widget.cpp b/src/widget/widget.cpp
index 0828cd0d5..e4c9fb91c 100644
--- a/src/widget/widget.cpp
+++ b/src/widget/widget.cpp
@@ -1032,8 +1032,8 @@ bool Widget::event(QEvent * e)
         case QEvent::Wheel:
         case QEvent::KeyPress:
         case QEvent::KeyRelease:
-            if (autoAwayActive)
-            {
+            if (autoAwayActive && ui->statusButton->property("status").toString() == "away")
+            { // be sure nothing else has changed the status in the meantime
                 qDebug() << "Widget: auto away deactivated at" << QTime::currentTime().toString();
                 autoAwayActive = false;
                 emit statusSet(Status::Online);