diff --git a/lib/widgets/dialogs/aves_dialog.dart b/lib/widgets/dialogs/aves_dialog.dart
index 2b944e95c..411c700a0 100644
--- a/lib/widgets/dialogs/aves_dialog.dart
+++ b/lib/widgets/dialogs/aves_dialog.dart
@@ -51,6 +51,8 @@ class AvesDialog extends StatelessWidget {
       actions: actions,
       actionsPadding: actionsPadding,
       buttonPadding: buttonPadding,
+      // clipping to prevent highlighted material to bleed through rounded corners
+      clipBehavior: Clip.antiAlias,
       shape: shape(context),
     );
   }
@@ -74,7 +76,8 @@ class AvesDialog extends StatelessWidget {
               thumbVisibility: MaterialStateProperty.all(true),
               radius: const Radius.circular(16),
               crossAxisMargin: 4,
-              mainAxisMargin: 4,
+              // adapt margin when corner is around content itself, not outside for the title
+              mainAxisMargin: 4 + (title != null ? 0 : cornerRadius.y / 2),
               interactive: true,
             ),
           ),
diff --git a/lib/widgets/dialogs/aves_selection_dialog.dart b/lib/widgets/dialogs/aves_selection_dialog.dart
index 473fd7824..f0d6ae29c 100644
--- a/lib/widgets/dialogs/aves_selection_dialog.dart
+++ b/lib/widgets/dialogs/aves_selection_dialog.dart
@@ -63,7 +63,7 @@ class _AvesSelectionDialogState<T> extends State<AvesSelectionDialog<T>> {
     return AvesDialog(
       title: title,
       scrollableContent: [
-        if (title == null && message == null) SizedBox(height: AvesDialog.cornerRadius.y),
+        if (title == null && message == null) SizedBox(height: AvesDialog.cornerRadius.y / 2),
         if (message != null)
           Padding(
             padding: const EdgeInsets.all(16),