diff --git a/webapp/packages/plugin-codemirror/src/theme/_base-code-editor.scss b/webapp/packages/plugin-codemirror/src/theme/_base-code-editor.scss
index 01bb8f5d40..f035f73bf7 100644
--- a/webapp/packages/plugin-codemirror/src/theme/_base-code-editor.scss
+++ b/webapp/packages/plugin-codemirror/src/theme/_base-code-editor.scss
@@ -87,7 +87,7 @@
       background: rgba(128, 203, 196, 0.2);
     }
 
-    .cm-s-material :global(div).CodeMirror-selected {
+    &.custom-select .cm-s-material :global(div).CodeMirror-selected {
       display: none;
     }
 
diff --git a/webapp/packages/plugin-ddl-viewer/src/DdlViewer/DdlViewer.tsx b/webapp/packages/plugin-ddl-viewer/src/DdlViewer/DdlViewer.tsx
index 074d579b30..cdf80ecffb 100644
--- a/webapp/packages/plugin-ddl-viewer/src/DdlViewer/DdlViewer.tsx
+++ b/webapp/packages/plugin-ddl-viewer/src/DdlViewer/DdlViewer.tsx
@@ -32,8 +32,8 @@ export interface DdlViewerTabPanelProps {
 
 export const ddlViewer = (nodeId: string) => (<DdlViewerTabPanel nodeId={nodeId} />);
 
-const DdlViewerTabPanel = observer(function DdlViewerTabPanel(props: DdlViewerTabPanelProps) {
-  const controller = useController(DdlViewerController, props.nodeId);
+const DdlViewerTabPanel: React.FC<DdlViewerTabPanelProps> = observer(function DdlViewerTabPanel({ nodeId }) {
+  const controller = useController(DdlViewerController, nodeId);
 
   if (controller.isLoading) {
     return <Loader />;
diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditor/SqlEditor.tsx b/webapp/packages/plugin-sql-editor/src/SqlEditor/SqlEditor.tsx
index 073a4a4b96..99dc367a4b 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlEditor/SqlEditor.tsx
+++ b/webapp/packages/plugin-sql-editor/src/SqlEditor/SqlEditor.tsx
@@ -63,6 +63,7 @@ const styles = composes(
     }
 
     SQLCodeEditorLoader {
+      composes: custom-select from global;
       flex: 1;
     }
   `