diff --git a/packages/bbui/src/Drawer/DrawerContent.svelte b/packages/bbui/src/Drawer/DrawerContent.svelte
index 1c7c48170f..85002af923 100644
--- a/packages/bbui/src/Drawer/DrawerContent.svelte
+++ b/packages/bbui/src/Drawer/DrawerContent.svelte
@@ -39,6 +39,10 @@
   .sidebar::-webkit-scrollbar {
     display: none;
   }
+  .main {
+    height: 100%;
+    overflow: hidden;
+  }
   .padding .main {
     padding: var(--spacing-xl);
   }
diff --git a/packages/builder/src/components/common/CodeEditor/CodeEditor.svelte b/packages/builder/src/components/common/CodeEditor/CodeEditor.svelte
index 9341711022..935ca98463 100644
--- a/packages/builder/src/components/common/CodeEditor/CodeEditor.svelte
+++ b/packages/builder/src/components/common/CodeEditor/CodeEditor.svelte
@@ -321,7 +321,7 @@
     top: 1px;
     height: calc(100% - 2px);
     width: 100%;
-    background: var(--spectrum-global-color-gray-75);
+    background: var(--spectrum-global-color-gray-100);
     z-index: -2;
   }
   .code-editor :global(.cm-gutterElement) {
@@ -343,7 +343,8 @@
     z-index: -2;
   }
   .code-editor :global(.cm-selectionBackground) {
-    background-color: var(--spectrum-global-color-gray-300) !important;
+    background-color: var(--spectrum-global-color-blue-400) !important;
+    opacity: 0.4;
   }
 
   .code-editor :global(.cm-tooltip.cm-completionInfo) {
diff --git a/packages/builder/src/components/common/CodeEditor/index.js b/packages/builder/src/components/common/CodeEditor/index.js
index 0cf3f240f1..deb5f272dd 100644
--- a/packages/builder/src/components/common/CodeEditor/index.js
+++ b/packages/builder/src/components/common/CodeEditor/index.js
@@ -114,8 +114,7 @@ export const getDefaultTheme = opts => {
         backgroundColor: "var(--spectrum-global-color-gray-200)",
       },
       "& .binding-wrap": {
-        color: "var(--spectrum-global-color-blue-700)",
-        fontFamily: "monospace",
+        color: "var(--spectrum-global-color-orange-600)",
       },
     },
     { dark }
diff --git a/packages/builder/src/components/common/bindings/BindingSidePanel.svelte b/packages/builder/src/components/common/bindings/BindingSidePanel.svelte
index b74f3c6fcd..d68857b420 100644
--- a/packages/builder/src/components/common/bindings/BindingSidePanel.svelte
+++ b/packages/builder/src/components/common/bindings/BindingSidePanel.svelte
@@ -258,6 +258,8 @@
 <style>
   .binding-side-panel {
     border-left: var(--border-light);
+    height: 100%;
+    overflow: auto;
   }
 
   .search :global(input) {