diff --git a/mail/js/app.js b/mail/js/app.js
index f28d285c01..fc54355c7d 100755
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -4548,7 +4548,7 @@ app.classes.mail = AppJS.extend(
 			// Coming from tree
 			acc_id = parseInt(_senders[0].id);
 		}
-		this.egw.open_link('mail.mail_sieve.editVacation&acc_id=' + acc_id, '_blank', '700x660');
+		this.egw.open_link('mail.mail_sieve.editVacation&acc_id=' + acc_id, '_blank', '700x800');
 	},
 
 	subscription_refresh: function(_data)
diff --git a/pixelegg/css/fancy.css b/pixelegg/css/fancy.css
index 4825d7c71a..18315e48b8 100644
--- a/pixelegg/css/fancy.css
+++ b/pixelegg/css/fancy.css
@@ -3214,6 +3214,7 @@ div#popupMainDiv {
   padding: 8px;
   background-color: #FFFFFF;
   background-repeat: repeat-x;
+  overflow: auto;
 }
 div#popupMainDiv > * {
   margin: 0px;
diff --git a/pixelegg/css/fancy.less b/pixelegg/css/fancy.less
index 8265058125..6ec28e8e43 100644
--- a/pixelegg/css/fancy.less
+++ b/pixelegg/css/fancy.less
@@ -198,7 +198,7 @@ div.flatpickr-calendar .shortcut-buttons-flatpickr-buttons button:last-child {
 }
 //end sidebox
 
-//not et2-select should also have rounded corners
+//normal select should also have rounded corners
 select{
     border-radius: var(--sl-border-radius-medium);
 }
diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css
index b4b51cdd6b..ca2e9d6bd2 100644
--- a/pixelegg/css/mobile.css
+++ b/pixelegg/css/mobile.css
@@ -3217,6 +3217,7 @@ div#popupMainDiv {
   padding: 8px;
   background-color: #FFFFFF;
   background-repeat: repeat-x;
+  overflow: auto;
 }
 div#popupMainDiv > * {
   margin: 0px;
diff --git a/pixelegg/css/monochrome.css b/pixelegg/css/monochrome.css
index b8fae63bdf..76bfe12bdb 100644
--- a/pixelegg/css/monochrome.css
+++ b/pixelegg/css/monochrome.css
@@ -3196,6 +3196,7 @@ div#popupMainDiv {
   padding: 8px;
   background-color: #FFFFFF;
   background-repeat: repeat-x;
+  overflow: auto;
 }
 div#popupMainDiv > * {
   margin: 0px;
diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css
index 9c88190646..532f8b43b9 100644
--- a/pixelegg/css/pixelegg.css
+++ b/pixelegg/css/pixelegg.css
@@ -3207,6 +3207,7 @@ div#popupMainDiv {
   padding: 8px;
   background-color: #FFFFFF;
   background-repeat: repeat-x;
+  overflow: auto;
 }
 div#popupMainDiv > * {
   margin: 0px;
@@ -4312,8 +4313,9 @@ body.scrollVertical {
   font-size: 120%;
 }
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items #rc_status_select {
-  width: 70% !important;
+  width: auto;
   margin-left: 10px;
+  margin-right: 10px;
 }
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items #rc_status_select sl-menu-item::part(checked-icon) {
   border-radius: 50%;
diff --git a/pixelegg/less/layout_dialog.less b/pixelegg/less/layout_dialog.less
index c726c48358..442f17d365 100755
--- a/pixelegg/less/layout_dialog.less
+++ b/pixelegg/less/layout_dialog.less
@@ -24,6 +24,7 @@ div#popupMainDiv {
     padding: 8px;
     background-color: @gray_0;
     background-repeat: repeat-x;
+	overflow: auto;//If popup is not big enough make sure we can still reach bottom buttons
 
 }