diff --git a/webapp/common-react/@dbeaver/react-data-grid/src/editors/TextEditor.module.css b/webapp/common-react/@dbeaver/react-data-grid/src/editors/TextEditor.module.css
index e8976a31dd..ed164d7e8f 100644
--- a/webapp/common-react/@dbeaver/react-data-grid/src/editors/TextEditor.module.css
+++ b/webapp/common-react/@dbeaver/react-data-grid/src/editors/TextEditor.module.css
@@ -1,6 +1,13 @@
 :global(.rdg-cell) .editor {
   appearance: none;
   resize: none;
+  overflow-x: auto;
+  overflow-y: hidden;
+  scrollbar-width: none;
+
+  &::-webkit-scrollbar {
+    display: none;
+  }
 
   box-sizing: border-box;
   min-height: initial;
diff --git a/webapp/common-react/@dbeaver/react-data-grid/src/editors/TextEditor.tsx b/webapp/common-react/@dbeaver/react-data-grid/src/editors/TextEditor.tsx
index 00281379e0..3c7e361cc2 100644
--- a/webapp/common-react/@dbeaver/react-data-grid/src/editors/TextEditor.tsx
+++ b/webapp/common-react/@dbeaver/react-data-grid/src/editors/TextEditor.tsx
@@ -45,6 +45,7 @@ export function TextEditor({ rowIdx, colIdx, onClose }: IProps) {
       ref={autoFocusAndSelect}
       className={classes['editor']}
       rows={1}
+      wrap="off"
       value={value}
       onChange={event => cellContext?.onCellChange?.(rowIdx, colIdx, event.target.value)}
       onBlur={() => onClose()}