diff --git a/data/ui/option.blp b/data/ui/option.blp
index 7648989e..e22338ea 100644
--- a/data/ui/option.blp
+++ b/data/ui/option.blp
@@ -47,7 +47,10 @@ template GradienceOption : Adw.ActionRow {
 }
 
 Popover warning-popover {
+  autohide: true;
   Label warning-label {
+    margin-top: 10;
+    margin-bottom: 10;
     max-width-chars: 50;
     wrap: true;
     justify: center;
@@ -55,9 +58,12 @@ Popover warning-popover {
 }
 
 Popover explanation-popover {
+  autohide: true;
   Label explanation-label {
+    margin-top: 10;
+    margin-bottom: 10;
     max-width-chars: 50;
     wrap: true;
     justify: center;
   }
-}
\ No newline at end of file
+}