diff --git a/src/public/stylesheets/theme-next-dark.css b/src/public/stylesheets/theme-next-dark.css
index 2dbeb525c..98f379c6e 100644
--- a/src/public/stylesheets/theme-next-dark.css
+++ b/src/public/stylesheets/theme-next-dark.css
@@ -232,6 +232,8 @@
     --help-kbd-shortcut-shadow: 1px 1px 2px rgba(0, 0, 0, 0.7);
     --help-code-color: inherit;
     --help-code-background: #565656;
+
+    --ck-editor-popup-border-color: var(--modal-border-color);
 }
 
 /*
diff --git a/src/public/stylesheets/theme-next-light.css b/src/public/stylesheets/theme-next-light.css
index 46c116e39..7793d8ece 100644
--- a/src/public/stylesheets/theme-next-light.css
+++ b/src/public/stylesheets/theme-next-light.css
@@ -232,4 +232,6 @@
     --help-kbd-shortcut-shadow: 1px 1px 2px rgba(0, 0, 0, 0.3);
     --help-code-color: black;
     --help-code-background: #d7d5d5;
+
+    --ck-editor-popup-border-color: var(--dropdown-border-color);
 }
diff --git a/src/public/stylesheets/theme-next/notes/text.css b/src/public/stylesheets/theme-next/notes/text.css
index 8dd09c485..0e673e9b2 100644
--- a/src/public/stylesheets/theme-next/notes/text.css
+++ b/src/public/stylesheets/theme-next/notes/text.css
@@ -36,14 +36,14 @@
 :root .ck.ck-dropdown__panel,
 :root .ck-balloon-panel {
     --ck-color-panel-background: var(--menu-background-color);
-    --ck-color-panel-border: var(--modal-border-color);
+    --ck-color-panel-border: var(--ck-editor-popup-border-color);
 
     box-shadow: 0px 10px 20px rgba(0, 0, 0, var(--dropdown-shadow-opacity));
-    border: 1px solid var(--modal-border-color) !important;
+    border: 1px solid var(--ck-editor-popup-border-color) !important;
     border-radius: var(--dropdown-border-radius) !important;
     background: var(--menu-background-color) !important;
     backdrop-filter: var(--dropdown-backdrop-filter);
-    padding: var(--menu-padding-size);    
+    padding: 4px;    
 }
 
 :root ul.ck.ck-list,