diff --git a/app/js/directives.js b/app/js/directives.js
index 1b6ba3a0..202f3b4c 100755
--- a/app/js/directives.js
+++ b/app/js/directives.js
@@ -1297,7 +1297,7 @@ angular.module('myApp.directives', ['myApp.filters'])
       var dragStarted, dragTimeout;
       var submitBtn = $('.im_submit', element)[0];
 
-      var stickerImageCompiled = $compile('<a class="composer_sticker_btn" my-load-sticker document="document" thumb="true" img-class="composer_sticker_image"></a>');
+      var stickerImageCompiled = $compile('<a class="composer_sticker_btn" data-sticker="{{::document.id}}" my-load-sticker document="document" thumb="true" img-class="composer_sticker_image"></a>');
       var cachedStickerImages = {};
 
       var emojiTooltip = new EmojiTooltip(emojiButton, {
diff --git a/app/js/message_composer.js b/app/js/message_composer.js
index b6ed70c6..074c211a 100644
--- a/app/js/message_composer.js
+++ b/app/js/message_composer.js
@@ -340,6 +340,7 @@ EmojiTooltip.prototype.updateTabContents = function () {
         if (!set.docIDs.length) {
           continue;
         }
+        html.push('<div class="composer_stickerset_wrap clearfix">');
         if (set.id && set.title) {
           html.push(
             '<a class="composer_stickerset_title" data-stickerset="',
@@ -353,6 +354,7 @@ EmojiTooltip.prototype.updateTabContents = function () {
           docID = set.docIDs[j];
           html.push('<a class="composer_sticker_btn" data-sticker="' + docID + '"></a>');
         }
+        html.push('</div>');
       }
       renderContent();
 
diff --git a/app/js/services.js b/app/js/services.js
index fa3bcbf6..adac9e49 100755
--- a/app/js/services.js
+++ b/app/js/services.js
@@ -3693,6 +3693,7 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils'])
         stickersetItems[setID].push(doc.id);
       }
 
+      currentStickersets = [];
       if (stickersetItems[0] !== undefined) {
         currentStickersets.push({
           _: 'stickerSetDefault',
diff --git a/app/less/app.less b/app/less/app.less
index 9be84bb6..c2b8e838 100644
--- a/app/less/app.less
+++ b/app/less/app.less
@@ -2476,7 +2476,7 @@ a.composer_emoji_btn {
 
 .composer_stickerset_title {
   display: block;
-  clear: both;
+  // clear: both;
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
@@ -2504,6 +2504,7 @@ a.composer_emoji_btn {
 .composer_sticker_image {
   max-width: 72px;
   max-height: 72px;
+  vertical-align: top;
 }
 
 .composer_rich_textarea {
@@ -2963,6 +2964,7 @@ a.contacts_modal_contact:hover .md_modal_list_peer_description,
 }
 .stickerset_actions {
   padding: 10px 20px;
+  height: 50px;
   text-align: center;
 }
 .stickerset_modal_loading {
diff --git a/app/partials/desktop/stickerset_modal.html b/app/partials/desktop/stickerset_modal.html
index 09065913..53100561 100644
--- a/app/partials/desktop/stickerset_modal.html
+++ b/app/partials/desktop/stickerset_modal.html
@@ -37,10 +37,10 @@
 
     </div>
 
-    <div class="stickerset_actions_wrap" ng-if="stickersetLoaded">
+    <div class="stickerset_actions_wrap">
       <div class="stickerset_actions" ng-switch="stickersetInstalled">
         <button ng-switch-when="true" class="btn btn-md btn-md-danger" my-i18n="stickerset_modal_uninstall" ng-click="toggleInstalled(false)"></button>
-        <button ng-switch-default class="btn btn-md btn-md-primary" my-i18n="stickerset_modal_install" ng-click="toggleInstalled(true)"></button>
+        <button ng-switch-when="false" class="btn btn-md btn-md-primary" my-i18n="stickerset_modal_install" ng-click="toggleInstalled(true)"></button>
       </div>
     </div>