diff --git a/app/js/controllers.js b/app/js/controllers.js
index 2fd8d1de..06526e6d 100644
--- a/app/js/controllers.js
+++ b/app/js/controllers.js
@@ -456,7 +456,7 @@ angular.module('myApp.controllers', ['myApp.i18n'])
     var pendingAttachment = false
     $scope.$on('history_focus', function (e, peerData) {
       if (peerData.peerString == $scope.curDialog.peer &&
-        peerData.messageID == $scope.curDialog.messageID &&
+          (peerData.messageID ? peerData.messageID == $scope.curDialog.messageID : !$scope.curDialog.messageID) &&
         !peerData.startParam) {
         if (peerData.messageID) {
           $scope.$broadcast('ui_history_change_scroll', true)