diff --git a/app/js/controllers.js b/app/js/controllers.js
index 723f2c8f..c3544a6c 100644
--- a/app/js/controllers.js
+++ b/app/js/controllers.js
@@ -429,7 +429,6 @@ angular.module('myApp.controllers', ['myApp.i18n'])
     var pendingParams = false
     var pendingAttachment = false
     $scope.$on('history_focus', function (e, peerData) {
-      $modalStack.dismissAll()
       if (peerData.peerString == $scope.curDialog.peer &&
         peerData.messageID == $scope.curDialog.messageID &&
         !peerData.startParam) {
@@ -615,6 +614,7 @@ angular.module('myApp.controllers', ['myApp.i18n'])
     updateCurDialog()
 
     function updateCurDialog () {
+      $modalStack.dismissAll()
       var addParams = pendingParams || {}
       pendingParams = false
       addParams.messageID = parseInt(addParams.messageID) || false