diff --git a/docs/en_US/release_notes_6_11.rst b/docs/en_US/release_notes_6_11.rst
index 5af7bb9cf..d6490727c 100644
--- a/docs/en_US/release_notes_6_11.rst
+++ b/docs/en_US/release_notes_6_11.rst
@@ -20,4 +20,5 @@ Bug fixes
 *********
 
   | `Issue #7411 <https://redmine.postgresql.org/issues/7411>`_ -  Fixed an issue where the Database restriction is not working.
+  | `Issue #7443 <https://redmine.postgresql.org/issues/7443>`_ -  Fixed and issue where 'Use spaces' not working in the query tool.
   | `Issue #7468 <https://redmine.postgresql.org/issues/7468>`_ -  Skip the history records if the JSON info can't be parsed instead of showing 'No history'.
diff --git a/web/pgadmin/static/js/components/CodeMirror.jsx b/web/pgadmin/static/js/components/CodeMirror.jsx
index ede3eca59..292541a07 100644
--- a/web/pgadmin/static/js/components/CodeMirror.jsx
+++ b/web/pgadmin/static/js/components/CodeMirror.jsx
@@ -463,7 +463,7 @@ export default function CodeMirror({currEditor, name, value, options, events, re
       editor?.current.setOption('foldGutter', pref.code_folding);
     }
 
-    editor?.current.setOption('indentWithTabs', pref.indent_with_tabs);
+    editor?.current.setOption('indentWithTabs', !pref.use_spaces);
     editor?.current.setOption('indentUnit', pref.tab_size);
     editor?.current.setOption('tabSize', pref.tab_size);
     editor?.current.setOption('lineWrapping', pref.wrap_code);