diff --git a/services/web/frontend/js/features/source-editor/extensions/go-to-line.ts b/services/web/frontend/js/features/source-editor/extensions/go-to-line.ts
index 639725e67e..e6b6bed5bc 100644
--- a/services/web/frontend/js/features/source-editor/extensions/go-to-line.ts
+++ b/services/web/frontend/js/features/source-editor/extensions/go-to-line.ts
@@ -41,7 +41,7 @@ const gotoLineTheme = EditorView.baseTheme({
         backgroundColor: 'var(--bg-primary-themed)',
         border: '1px solid var(--border-primary-themed)',
         backgroundImage: 'none',
-        borderRadius: 'var(--border-radius-full)',
+        borderRadius: 'var(--border-radius-base)',
         boxShadow: 'inset 0 1px 1px rgb(0 0 0 / 8%)',
         transition:
           'border-color ease-in-out .15s, box-shadow ease-in-out .15s',
diff --git a/services/web/frontend/js/features/source-editor/extensions/search.ts b/services/web/frontend/js/features/source-editor/extensions/search.ts
index 9a6538c00f..40388c5a72 100644
--- a/services/web/frontend/js/features/source-editor/extensions/search.ts
+++ b/services/web/frontend/js/features/source-editor/extensions/search.ts
@@ -342,7 +342,7 @@ const searchFormTheme = EditorView.theme({
   '.ol-cm-search-input-group': {
     backgroundColor: 'var(--bg-primary-themed)',
     border: '1px solid var(--border-primary-themed)',
-    borderRadius: '20px',
+    borderRadius: 'var(--border-radius-base)',
     width: '100%',
     maxWidth: '50em',
     display: 'inline-flex',
@@ -354,7 +354,7 @@ const searchFormTheme = EditorView.theme({
     '& input[type="text"]': {
       background: 'none',
       boxShadow: 'none',
-      borderRadius: '20px',
+      borderRadius: 'var(--border-radius-base)',
     },
     '& input[type="text"]:focus': {
       outline: 'none',