diff --git a/Packages/AppAccount/Sources/AppAccount/AppAccountsSelectorView.swift b/Packages/AppAccount/Sources/AppAccount/AppAccountsSelectorView.swift
index 4bcdeb04..5b641211 100644
--- a/Packages/AppAccount/Sources/AppAccount/AppAccountsSelectorView.swift
+++ b/Packages/AppAccount/Sources/AppAccount/AppAccountsSelectorView.swift
@@ -105,7 +105,7 @@ public struct AppAccountsSelectorView: View {
       }
     }
 
-    if UIDevice.current.userInterfaceIdiom == .phone {
+    if UIDevice.current.userInterfaceIdiom == .phone && accountCreationEnabled {
       Divider()
       Button {
         HapticManager.shared.fireHaptic(of: .buttonPress)
diff --git a/Packages/Status/Sources/Status/Editor/StatusEditorView.swift b/Packages/Status/Sources/Status/Editor/StatusEditorView.swift
index 27c2fe4d..99894c42 100644
--- a/Packages/Status/Sources/Status/Editor/StatusEditorView.swift
+++ b/Packages/Status/Sources/Status/Editor/StatusEditorView.swift
@@ -12,6 +12,7 @@ import UIKit
 import StoreKit
 
 public struct StatusEditorView: View {
+  @EnvironmentObject private var appAccounnt: AppAccountsManager
   @EnvironmentObject private var preferences: UserPreferences
   @EnvironmentObject private var theme: Theme
   @EnvironmentObject private var client: Client
@@ -159,7 +160,12 @@ public struct StatusEditorView: View {
         }
       }
     }
-    .interactiveDismissDisabled(!viewModel.statusText.string.isEmpty)
+    .interactiveDismissDisabled(!viewModel.shouldDisplayDismissWarning)
+    .onChange(of: appAccounnt.currentClient) { newClient in
+      if viewModel.mode.isInShareExtension {
+        currentAccount.setClient(client: newClient)
+      }
+    }
   }
 
   @ViewBuilder
@@ -228,7 +234,7 @@ public struct StatusEditorView: View {
                                 avatarSize: .status)
         VStack(alignment: .leading, spacing: 4) {
           privacyMenu
-          Text("@\(account.acct)")
+          Text("@\(account.acct)@\(client.server)")
             .font(.scaledFootnote)
             .foregroundColor(.gray)
         }
diff --git a/Packages/Status/Sources/Status/Row/StatusMediaPreviewView.swift b/Packages/Status/Sources/Status/Row/StatusMediaPreviewView.swift
index a6f37e69..60a24dda 100644
--- a/Packages/Status/Sources/Status/Row/StatusMediaPreviewView.swift
+++ b/Packages/Status/Sources/Status/Row/StatusMediaPreviewView.swift
@@ -163,6 +163,7 @@ public struct StatusMediaPreviewView: View {
               .frame(width: newSize.width, height: newSize.height)
           }
         }
+        .frame(width: newSize.width, height: newSize.height)
 
       case .gifv, .video, .audio:
         if let url = attachment.url {