diff --git a/src/app/components/stream/user-profile/user-profile.component.html b/src/app/components/stream/user-profile/user-profile.component.html
index d194895d..f65e1c91 100644
--- a/src/app/components/stream/user-profile/user-profile.component.html
+++ b/src/app/components/stream/user-profile/user-profile.component.html
@@ -180,19 +180,19 @@
                     </div>
                 </div>
 
-                <div *ngIf="!isLoading && !statusLoading && statuses.length == 0" class="profile-no-toots">
-                    no status found
-                </div>
-
-                <div *ngIf="statusSection === 'status'">
-                    <div *ngFor="let statusWrapper of pinnedStatuses">
-                        <app-status [statusWrapper]="statusWrapper" (browseHashtagEvent)="browseHashtag($event)"
-                            (browseAccountEvent)="browseAccount($event)" (browseThreadEvent)="browseThread($event)">
-                        </app-status>
-                    </div>
-                </div>
-
                 <div [class.profile__status-switching-section]="isSwitchingSection">
+                    <div *ngIf="!isLoading && !statusLoading && statuses.length == 0" class="profile-no-toots">
+                        no status found
+                    </div>
+
+                    <div *ngIf="statusSection === 'status' && !statusLoading">
+                        <div *ngFor="let statusWrapper of pinnedStatuses">
+                            <app-status [statusWrapper]="statusWrapper" (browseHashtagEvent)="browseHashtag($event)"
+                                (browseAccountEvent)="browseAccount($event)" (browseThreadEvent)="browseThread($event)">
+                            </app-status>
+                        </div>
+                    </div>
+
                     <div *ngFor="let statusWrapper of statuses">
                         <div *ngIf="statusSection !== 'media'">
                             <app-status [statusWrapper]="statusWrapper" (browseHashtagEvent)="browseHashtag($event)"
@@ -209,7 +209,7 @@
                     </div>
                     <div style="clear: both;"></div>
                     <app-waiting-animation *ngIf="statusLoading" class="waiting-icon"></app-waiting-animation>
-                </div>                
+                </div>
             </div>
         </div>
     </div>
diff --git a/src/app/components/stream/user-profile/user-profile.component.scss b/src/app/components/stream/user-profile/user-profile.component.scss
index ca2eb722..4744d5f2 100644
--- a/src/app/components/stream/user-profile/user-profile.component.scss
+++ b/src/app/components/stream/user-profile/user-profile.component.scss
@@ -344,7 +344,7 @@ $floating-header-height: 60px;
     }
 
     &__status-switching-section {
-        height: calc(100vh - 35px - #{$floating-header-height} - #{$stream-header-height} - #{$stream-selector-height});
+        height: calc(100vh - 35px - #{$floating-header-height} - #{$stream-header-height} - #{$stream-selector-height});        
     }
 
     &-no-toots {
diff --git a/src/app/components/stream/user-profile/user-profile.component.ts b/src/app/components/stream/user-profile/user-profile.component.ts
index da7d8c26..b32afed3 100644
--- a/src/app/components/stream/user-profile/user-profile.component.ts
+++ b/src/app/components/stream/user-profile/user-profile.component.ts
@@ -323,7 +323,7 @@ export class UserProfileComponent implements OnInit {
 
     isSwitchingSection: boolean;
     switchStatusSection(section: 'status' | 'replies' | 'media'): boolean {
-        this.isSwitchingSection = true;
+         this.isSwitchingSection = true;
 
         this.statusSection = section;
         this.statuses.length = 0;
@@ -346,7 +346,7 @@ export class UserProfileComponent implements OnInit {
         }
         if (promise) {
             promise
-                .catch(err => {                    
+                .catch(err => {
                 })
                 .then(() => {
                     this.isSwitchingSection = false;
@@ -355,6 +355,14 @@ export class UserProfileComponent implements OnInit {
             this.isSwitchingSection = false;
         }
 
+        if (this.showFloatingStatusMenu) {
+            setTimeout(() => {
+                var element = this.statustream.nativeElement as HTMLElement;
+                const menuPosition = element.scrollHeight - this.profilestatuses.nativeElement.offsetHeight - 30 - 29;
+                element.scrollTop = menuPosition;
+            }, 0);
+        }
+
         return false;
     }