diff --git a/lib/ui/app/main_screen.dart b/lib/ui/app/main_screen.dart
index eadc19ffd..d826c2e15 100644
--- a/lib/ui/app/main_screen.dart
+++ b/lib/ui/app/main_screen.dart
@@ -689,7 +689,8 @@ class EntityScreens extends StatelessWidget {
                         children: [
                           if (prefState.isViewerFullScreen(
                               state.uiState.filterEntityType))
-                            Expanded(
+                            SizedBox(
+                              height: 350,
                               child: topFilterChild,
                             )
                           else
diff --git a/lib/ui/client/view/client_view_fullwidth.dart b/lib/ui/client/view/client_view_fullwidth.dart
index 6a6f0688b..31376ed92 100644
--- a/lib/ui/client/view/client_view_fullwidth.dart
+++ b/lib/ui/client/view/client_view_fullwidth.dart
@@ -252,7 +252,7 @@ class _ClientViewFullwidthState extends State<ClientViewFullwidth>
                                   overflow: TextOverflow.ellipsis,
                                 )),
                           ),
-                          SizedBox(width: kTableColumnGap),
+                          SizedBox(width: 4),
                           Flexible(
                             child: OutlinedButton(
                                 onPressed: () {
@@ -260,7 +260,7 @@ class _ClientViewFullwidthState extends State<ClientViewFullwidth>
                                       '${contact.link}&client_hash=${client.clientHash}';
                                   Clipboard.setData(ClipboardData(text: url));
                                   showToast(localization.copiedToClipboard
-                                      .replaceFirst(':value ', url));
+                                      .replaceFirst(':value ', ''));
                                 },
                                 child: Text(
                                   localization.copyLink,