diff --git a/src/app/components/create-status/create-status.component.html b/src/app/components/create-status/create-status.component.html
index 44209a0b..1d263353 100644
--- a/src/app/components/create-status/create-status.component.html
+++ b/src/app/components/create-status/create-status.component.html
@@ -1,8 +1,4 @@
 <form class="status-form" (ngSubmit)="onSubmit()">
-    <div class="status-form__sending" *ngIf="isSending">
-        <app-waiting-animation class="waiting-icon"></app-waiting-animation>
-    </div>
-
     <input [(ngModel)]="title" type="text" class="form-control form-control-sm status-editor__title" name="title"
         autocomplete="off" placeholder="Title, Content Warning (optional)" title="title, content warning (optional)" />
 
@@ -20,10 +16,12 @@
 
     <div class="status-editor__footer">
         <button type="submit" title="reply" class="status-editor__footer--send-button" *ngIf="statusReplyingToWrapper">
-            <span>REPLY!</span>
+            <span *ngIf="!isSending">REPLY!</span>
+            <app-waiting-animation class="waiting-icon" *ngIf="isSending"></app-waiting-animation>
         </button>
         <button type="submit" title="post" class="status-editor__footer--send-button" *ngIf="!statusReplyingToWrapper">
-            <span>POST!</span>
+            <span *ngIf="!isSending">POST!</span>
+            <app-waiting-animation class="waiting-icon" *ngIf="isSending"></app-waiting-animation>
         </button>
         <div class="status-editor__footer__counter">
             <div class="status-editor__footer__counter--posts" title="number of statuses">
diff --git a/src/app/components/create-status/create-status.component.scss b/src/app/components/create-status/create-status.component.scss
index d9c952f7..233429d1 100644
--- a/src/app/components/create-status/create-status.component.scss
+++ b/src/app/components/create-status/create-status.component.scss
@@ -138,21 +138,7 @@ $counter-width: 90px;
 .status-form {
     position: relative;
     font-size: $default-font-size;
-
-    &__sending {
-        position: absolute;
-        top: 0px;
-        left: 4px;
-        right: 4px;
-        bottom: 4px;
-        background-color: rgba($column-color, .75);
-        z-index: 2;
-
-        &--waiting {
-            margin-top: calc(25%);
-        }
-    }
-
+    
     &__status {
         &::-webkit-resizer {
             // border: 2px solid black;
@@ -168,14 +154,6 @@ $counter-width: 90px;
         }
     }
 
-    // &__autosuggest {
-    //     display: block;
-    //     margin: auto;
-    //     position: relative;
-    //     top: -5px;
-    //     width: calc(100% - 10px);
-    // }
-
     &__mention-error {
         border: 2px dashed red;
         padding: 5px 10px;