diff --git a/app/js/controllers.js b/app/js/controllers.js
index 7d628c2f..7c14dfc1 100644
--- a/app/js/controllers.js
+++ b/app/js/controllers.js
@@ -62,7 +62,8 @@ angular.module('myApp.controllers', ['myApp.i18n'])
       var modal = $modal.open({
         templateUrl: templateUrl('country_select_modal'),
         controller: 'CountrySelectModalController',
-        windowClass: 'countries_modal_window mobile_modal'
+        windowClass: 'countries_modal_window mobile_modal',
+        backdrop: 'single'
       });
 
       modal.result.then(selectCountry);
@@ -462,7 +463,8 @@ angular.module('myApp.controllers', ['myApp.i18n'])
       $modal.open({
         templateUrl: templateUrl('settings_modal'),
         controller: 'SettingsModalController',
-        windowClass: 'settings_modal_window mobile_modal'
+        windowClass: 'settings_modal_window mobile_modal',
+        backdrop: 'single'
       });
     };
 
@@ -499,7 +501,8 @@ angular.module('myApp.controllers', ['myApp.i18n'])
             templateUrl: templateUrl('chat_create_modal'),
             controller: 'ChatCreateModalController',
             scope: scope,
-            windowClass: 'md_simple_modal_window mobile_modal'
+            windowClass: 'md_simple_modal_window mobile_modal',
+            backdrop: 'single'
           });
         }
 
diff --git a/app/js/locales/en-us.json b/app/js/locales/en-us.json
index 443f7ef7..e422b3f6 100644
--- a/app/js/locales/en-us.json
+++ b/app/js/locales/en-us.json
@@ -194,6 +194,7 @@
 	"confirm_modal_forward_to_peer": "Forward to {peer}?",
 	"confirm_modal_send_to_peer": "Send to {peer}?",
 	"confirm_modal_share_file_peer": "Share with {peer}?",
+	"confirm_modal_invite_peer": "Invite to {peer}?",
 	"confirm_modal_apply_lang_with_reload_md": "Reload the App to apply language?",
 	"confirm_modal_migrate_to_https_md": "Telegram Web now supports additional SSL encryption. Would you like to switch to HTTPS?\nThe HTTP version will be disabled soon.",
 	"confirm_modal_resize_desktop_md": "Would you like to switch to desktop version?",
diff --git a/app/js/message_composer.js b/app/js/message_composer.js
index a356746c..d01018e8 100644
--- a/app/js/message_composer.js
+++ b/app/js/message_composer.js
@@ -303,6 +303,9 @@ EmojiTooltip.prototype.updateTabContents = function () {
 
   if (this.tab == 6) { // Stickers
     var renderStickers = function (stickersets) {
+      if (self.tab != 6) {
+        return;
+      }
       var set, docID, i, j, len1, len2;
       for (i = 0, len1 = stickersets.length; i < len1; i++) {
         set = stickersets[i];
diff --git a/app/js/services.js b/app/js/services.js
index 4c70c818..a1b15722 100755
--- a/app/js/services.js
+++ b/app/js/services.js
@@ -5605,7 +5605,8 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils'])
       templateUrl: templateUrl('peer_select'),
       controller: 'PeerSelectController',
       scope: scope,
-      windowClass: 'peer_select_window mobile_modal'
+      windowClass: 'peer_select_window mobile_modal',
+      backdrop: 'single'
     }).result;
   }
 
@@ -5627,7 +5628,8 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils'])
       templateUrl: templateUrl('peer_select'),
       controller: 'PeerSelectController',
       scope: scope,
-      windowClass: 'peer_select_window mobile_modal'
+      windowClass: 'peer_select_window mobile_modal',
+      backdrop: 'single'
     }).result;
   }
 
@@ -5655,7 +5657,8 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils'])
       templateUrl: templateUrl('contacts_modal'),
       controller: 'ContactsModalController',
       scope: scope,
-      windowClass: 'contacts_modal_window mobile_modal'
+      windowClass: 'contacts_modal_window mobile_modal',
+      backdrop: 'single'
     }).result;
   }
 
diff --git a/app/less/app.less b/app/less/app.less
index 5d692d94..96316dcf 100644
--- a/app/less/app.less
+++ b/app/less/app.less
@@ -2440,7 +2440,7 @@ img.img_fullsize {
 .composer_emoji_tooltip_tab_stickers {background-position: -9px -361px; }
 .composer_emoji_tooltip_tab_stickers.active {background-position: -9px -333px; }
 
-.composer_emoji_tooltip_scrollable_container {
+.composer_emoji_tooltip .scroller_scrollable_container {
   height: 174px;
   position: relative;
 }
@@ -3918,6 +3918,9 @@ a.countries_modal_search_clear {
 .md_modal_footer {
   padding: 15px 27px 15px;
 }
+.md_modal_footer_empty {
+  padding: 15px 27px 0;
+}
 
 .md_photo_loading {
   display: block;
diff --git a/app/partials/desktop/confirm_modal.html b/app/partials/desktop/confirm_modal.html
index d1c583cd..aa997f44 100644
--- a/app/partials/desktop/confirm_modal.html
+++ b/app/partials/desktop/confirm_modal.html
@@ -33,6 +33,7 @@
         <span ng-switch-when="FORWARD_PEER" my-i18n-format="confirm_modal_forward_to_peer"></span>
         <span ng-switch-when="SHARE_CONTACT_PEER" my-i18n-format="confirm_modal_send_to_peer"></span>
         <span ng-switch-when="EXT_SHARE_PEER" my-i18n-format="confirm_modal_share_file_peer"></span>
+        <span ng-switch-when="INVITE_TO_GROUP" my-i18n-format="confirm_modal_invite_peer"></span>
         <my-i18n-param name="peer">
           <strong ng-switch="peer_id > 0">
             <span ng-switch-when="true" my-user-link="peer_id"></span>
diff --git a/app/partials/desktop/peer_select.html b/app/partials/desktop/peer_select.html
index 043301a1..2636992c 100644
--- a/app/partials/desktop/peer_select.html
+++ b/app/partials/desktop/peer_select.html
@@ -71,5 +71,6 @@
     </div>
   </div>
 
+  <div class="md_modal_footer md_modal_footer_empty clearfix" ng-if="!multiSelect"></div>
 
 </div>