diff --git a/app/js/controllers.js b/app/js/controllers.js
index 84c2ccc6..8b0298f5 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)
@@ -603,10 +603,6 @@ angular.module('myApp.controllers', ['myApp.i18n'])
       $rootScope.$broadcast('history_focus', params)
     }
 
-    $scope.scrollChatToBottom = function () {
-      $scope.$broadcast('ui_history_change_scroll', true)
-    }
-
     $scope.logOut = function () {
       ErrorService.confirm({type: 'LOGOUT'}).then(function () {
         MtpApiManager.logOut().then(function () {
diff --git a/app/partials/desktop/dialog.html b/app/partials/desktop/dialog.html
index fe001360..5d4b6536 100644
--- a/app/partials/desktop/dialog.html
+++ b/app/partials/desktop/dialog.html
@@ -1,4 +1,4 @@
-<a class="im_dialog" ng-mousedown="dialogSelect(dialogMessage.peerString, dialogMessage.unreadCount == -1 && dialogMessage.mid)" ng-dblclick="scrollChatToBottom()">
+<a class="im_dialog" ng-mousedown="dialogSelect(dialogMessage.peerString, dialogMessage.unreadCount == -1 && dialogMessage.mid)">
 
   <div class="im_dialog_meta pull-right text-right">
     <div class="im_dialog_date" ng-bind="dialogMessage.dateText"></div>