diff --git a/webext/css/options.css b/webext/css/options.css
index 0d0f071..bab7781 100644
--- a/webext/css/options.css
+++ b/webext/css/options.css
@@ -96,6 +96,10 @@ body {
   padding: 10px 10px 10px 10px;
 }
 
+#accountsFolders {
+  width: fit-content;
+}
+
 #accountmenudialog1 td:nth-child(1) {
   width: 7em;
 }
@@ -115,9 +119,13 @@ body {
 #accountsTreeHeader {
   display: flex;
   justify-content: space-between;
-  width: 25em;
+  width: 100%;
   height: 2.2em;
-  margin-left: 10px
+  margin-left: 10px;
+}
+
+#accountsTreeHeaderRight {
+  margin-right: 20px;
 }
 
 ul,
@@ -127,7 +135,7 @@ ul,
 
 /* Remove margins and padding from the parent ul */
 #accountsTree {
-  width: 25em;
+  width: fit-content;;
   border-style: solid;
   border-width: 1px;
   margin: 0;
@@ -136,6 +144,7 @@ ul,
 
 #accountContainer {
   float: right;
+  margin-left: 40px;
   margin-right: 40px;
 }
 
diff --git a/webext/options.html b/webext/options.html
index 067aea6..ace8aba 100644
--- a/webext/options.html
+++ b/webext/options.html
@@ -720,8 +720,8 @@
 
         <div id="accountsFolders">
           <div id="accountsTreeHeader">
-            <p>__MSG_accounts_folders__</p>
-            <p>__MSG_accounts_new__</p>
+            <p id="accountsTreeHeaderLeft">__MSG_accounts_folders__</p>
+            <p id="accountsTreeHeaderRight">__MSG_accounts_new__</p>
           </div>
 
           <ul id="accountsTree"></ul>