diff --git a/app/partials/mobile/head.html b/app/partials/mobile/head.html
index 79c03d40..cd05bbe8 100644
--- a/app/partials/mobile/head.html
+++ b/app/partials/mobile/head.html
@@ -86,7 +86,7 @@
                 <a href="#/im" class="navbar-quick-group-back">
                   <i class="icon icon-back"></i>
                   <div class="navbar-quick-back-title">
-                    <h4 my-peer-link="historyPeer.id"></h4>
+                    <h4 my-peer-link="historyPeer.id" peer-watch="true"></h4>
                     <small ng-switch="historyState.typing.length">
                       <span ng-switch-when="0" class="tg_head_peer_status" my-chat-status="-historyPeer.id"></span>
                       <my-i18n>
diff --git a/app/vendor/ui-bootstrap/ui-bootstrap-custom-tpls-0.12.0.js b/app/vendor/ui-bootstrap/ui-bootstrap-custom-tpls-0.12.0.js
index de1ff96c..bd219029 100644
--- a/app/vendor/ui-bootstrap/ui-bootstrap-custom-tpls-0.12.0.js
+++ b/app/vendor/ui-bootstrap/ui-bootstrap-custom-tpls-0.12.0.js
@@ -787,6 +787,11 @@ angular.module('ui.bootstrap.modal', ['ui.bootstrap.transition'])
         element.addClass(attrs.windowClass || '');
         scope.size = attrs.size;
 
+        // moved from template to fix issue #2280
+        element.on('click', function(evt) {
+          scope.close(evt);
+        });
+
         $modalStack.registerObserverCallback(function(hiddenBySingle) {
           scope.hiddenBySingle = hiddenBySingle || false;
         });
@@ -1257,7 +1262,7 @@ angular.module("template/modal/backdrop.html", []).run(["$templateCache", functi
 
 angular.module("template/modal/window.html", []).run(["$templateCache", function($templateCache) {
   $templateCache.put("template/modal/window.html",
-    "<div tabindex=\"-1\" role=\"dialog\" class=\"modal fade\" ng-class=\"{in: animate}\" ng-style=\"{'z-index': 1050 + index*10, display: hiddenBySingle ? 'none' : 'block'}\" ng-click=\"close($event)\">\n" +
+    "<div tabindex=\"-1\" role=\"dialog\" class=\"modal fade\" ng-class=\"{in: animate}\" ng-style=\"{'z-index': 1050 + index*10, display: hiddenBySingle ? 'none' : 'block'}\">\n" +
     "  <div class=\"modal_close_wrap\" ng-click=\"close($event)\">\n" +
     "    <div class=\"modal_close\"></div>\n" +
     "  </div>\n" +