diff --git a/app/js/controllers.js b/app/js/controllers.js
index 3502815b..b240eeb2 100644
--- a/app/js/controllers.js
+++ b/app/js/controllers.js
@@ -2249,7 +2249,8 @@ angular.module('myApp.controllers', ['myApp.i18n'])
 
     $scope.$on('draft_updated', function (e, draftUpdate) {
       if (draftUpdate.peerID == $scope.curDialog.peerID &&
-          !draftUpdate.local) {
+          !draftUpdate.local &&
+          (!$scope.draftMessage.text || $rootScope.idle.isIDLE)) {
         getDraft()
       }
     })