diff --git a/Web/Presenters/templates/User/View.xml b/Web/Presenters/templates/User/View.xml
index 261a92fa..1ad941f4 100644
--- a/Web/Presenters/templates/User/View.xml
+++ b/Web/Presenters/templates/User/View.xml
@@ -321,7 +321,7 @@
                         <input type="text" name="status" size="50" value="{$user->getStatus()}" />
                     </div>
                     <input type="hidden" name="hash" value="{$csrfToken}" />
-                    <button type="submit" name="submit" class="button" style="width: 43px; height: 22px;">{_send}</button>
+                    <button type="submit" name="submit" class="button" style="height: 22px;">{_send}</button>
                 </form>
             </div>
 			<div class="accountInfo clearFix">
@@ -546,6 +546,8 @@
         <script n:if="isset($thisUser) && $user->getId() == $thisUser->getId()" n:syntax="off">
             function setStatusEditorShown(shown) {
                 document.getElementById("status_editor").style.display = shown ? "block" : "none";
+                if(!document.status_popup_form.submit.style.width)
+                    document.status_popup_form.submit.style.width = document.status_popup_form.submit.offsetWidth + 4 + "px"
             }
 
             document.addEventListener("click", event => {
diff --git a/Web/static/css/style.css b/Web/static/css/style.css
index 564b850a..01c0648e 100644
--- a/Web/static/css/style.css
+++ b/Web/static/css/style.css
@@ -416,7 +416,7 @@ table {
     box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12);;
     padding: 10px;
     float: right;
-    margin-top: 6px;
+    margin-top: 5px;
     margin-left: -6px;
 }