diff --git a/app/js/directives.js b/app/js/directives.js
index 60d8f058..37b56787 100755
--- a/app/js/directives.js
+++ b/app/js/directives.js
@@ -1393,6 +1393,7 @@ angular.module('myApp.directives', ['myApp.filters'])
 
           if (e.type == 'dragenter' || e.type == 'dragover') {
             if (dragStateChanged) {
+              $(emojiButton).hide();
               $(dropbox)
                 .css({height: messageFieldWrap.offsetHeight + 2, width: messageFieldWrap.offsetWidth})
                 .show();
@@ -1406,6 +1407,7 @@ angular.module('myApp.directives', ['myApp.filters'])
             }
             dragTimeout = setTimeout(function () {
               $(dropbox).hide();
+              $(emojiButton).show();
               dragStarted = false;
               dragTimeout = false;
             }, 300);
diff --git a/app/less/desktop.less b/app/less/desktop.less
index ec6819a0..0c1bf2cc 100644
--- a/app/less/desktop.less
+++ b/app/less/desktop.less
@@ -1350,6 +1350,11 @@ a.im_panel_peer_photo .peer_initials {
       margin-bottom: 7px;
     }
   }
+
+  .im_send_dropbox_wrap {
+    padding-top: 5px;
+    padding-bottom: 5px;
+  }
 }
 
 /* Peer modals */