diff --git a/lib/controls/timeline/status_header_control.dart b/lib/controls/timeline/status_header_control.dart
index e68ef01..20ccb7e 100644
--- a/lib/controls/timeline/status_header_control.dart
+++ b/lib/controls/timeline/status_header_control.dart
@@ -35,9 +35,7 @@ class StatusHeaderControl extends StatelessWidget {
     final reshareAuthor = getIt<ConnectionsManager>()
         .getById(entry.reshareAuthorId)
         .getValueOrElse(() => Connection());
-    return Row(
-      mainAxisAlignment: MainAxisAlignment.start,
-      crossAxisAlignment: CrossAxisAlignment.start,
+    return Wrap(
       children: [
         GestureDetector(
           onTap: () => goToProfile(context, author.id),
@@ -59,6 +57,7 @@ class StatusHeaderControl extends StatelessWidget {
               ),
             ),
             Row(
+              mainAxisSize: MainAxisSize.min,
               children: [
                 Text(
                   ElapsedDateUtils.epochSecondsToString(
@@ -99,7 +98,9 @@ class StatusHeaderControl extends StatelessWidget {
           ),
         ],
         if (showOpenControl) ...[
-          const Expanded(child: SizedBox()),
+          SizedBox(
+            width: 20.0,
+          ),
           buildActionBar(context),
         ],
       ],
@@ -108,6 +109,7 @@ class StatusHeaderControl extends StatelessWidget {
 
   Widget buildActionBar(BuildContext context) {
     return Row(
+      mainAxisSize: MainAxisSize.min,
       children: [
         IconButton(
           onPressed: () async {