diff --git a/src/widget/form/settings/generalform.cpp b/src/widget/form/settings/generalform.cpp
index 162e9413b..8a556c4e7 100644
--- a/src/widget/form/settings/generalform.cpp
+++ b/src/widget/form/settings/generalform.cpp
@@ -112,7 +112,9 @@ void GeneralForm::onStyleSelected(QString style)
 
 void GeneralForm::onAutoAwayChanged()
 {
-    Settings::getInstance().setAutoAwayTime(bodyUI->autoAwaySpinBox->value());
+    int minutes = bodyUI->autoAwaySpinBox->value();
+    Settings::getInstance().setAutoAwayTime(minutes);
+    Widget::getInstance()->setIdleTimer(minutes);
 }
 
 void GeneralForm::onSetStatusChange()
diff --git a/src/widget/widget.cpp b/src/widget/widget.cpp
index 27a0f2a25..9370d93d0 100644
--- a/src/widget/widget.cpp
+++ b/src/widget/widget.cpp
@@ -294,6 +294,11 @@ QString Widget::askProfiles()
         return profile;
 }
 
+void Widget::setIdleTimer(int minutes)
+{
+    idleTimer->start(mins * 1000*60);
+}
+
 QString Widget::getUsername()
 {
     return core->getUsername();
diff --git a/src/widget/widget.h b/src/widget/widget.h
index 602e8a889..98e664706 100644
--- a/src/widget/widget.h
+++ b/src/widget/widget.h
@@ -59,6 +59,7 @@ public:
     bool getIsWindowMinimized();
     static QList<QString> searchProfiles();
     void clearContactsList();
+    void setIdleTimer(int minutes);    
     ~Widget();
 
     virtual void closeEvent(QCloseEvent *event);