diff --git a/docs/en_US/release_notes_5_3.rst b/docs/en_US/release_notes_5_3.rst
index 0b7b1c720..3e281ab52 100644
--- a/docs/en_US/release_notes_5_3.rst
+++ b/docs/en_US/release_notes_5_3.rst
@@ -26,6 +26,7 @@ Bug fixes
 | `Issue #6377 <https://redmine.postgresql.org/issues/6377>`_ -  Fixed an issue where schema diff does not create DROP DEFAULT statement for columns.
 | `Issue #6385 <https://redmine.postgresql.org/issues/6385>`_ -  Ensure that Backup and Restore should work on shared servers.
 | `Issue #6408 <https://redmine.postgresql.org/issues/6408>`_ -  Fixed ModuleNotFoundError when running setup.py from outside of the root.
+| `Issue #6409 <https://redmine.postgresql.org/issues/6409>`_ -  Fixed an issue where the current debug line is not visible in the 'Dark' theme.
 | `Issue #6413 <https://redmine.postgresql.org/issues/6413>`_ -  Fixed an issue where duplicate columns are visible in the browser tree, which is owned by two sequences.
 | `Issue #6416 <https://redmine.postgresql.org/issues/6416>`_ -  Added comment column in the properties panel for View and Materialized View collection node.
 | `Issue #6417 <https://redmine.postgresql.org/issues/6417>`_ -  Fixed an issue where query editor is not being closed if the user clicks on the 'Don't Save' button.
diff --git a/web/pgadmin/static/scss/_codemirror.overrides.scss b/web/pgadmin/static/scss/_codemirror.overrides.scss
index 6d84ca606..476015267 100644
--- a/web/pgadmin/static/scss/_codemirror.overrides.scss
+++ b/web/pgadmin/static/scss/_codemirror.overrides.scss
@@ -174,7 +174,7 @@
 }
 
 .CodeMirror-activeline-background {
-  background: $color-danger-lighter !important;
+  background: $color-editor-activeline !important;
 }
 
 .CodeMirror-simplescroll-horizontal {
diff --git a/web/pgadmin/static/scss/resources/dark/_theme.variables.scss b/web/pgadmin/static/scss/resources/dark/_theme.variables.scss
index 4605b0fcd..efa36df8c 100644
--- a/web/pgadmin/static/scss/resources/dark/_theme.variables.scss
+++ b/web/pgadmin/static/scss/resources/dark/_theme.variables.scss
@@ -77,7 +77,7 @@ $color-editor-comment: #7fcc5c;
 $color-editor-bracket: #d6aaaa;
 $color-editor-operator: #d6aaaa;
 $color-editor-foldmarker: #0000FF !default;
-$color-editor-activeline: #50B0F0 !default;
+$color-editor-activeline: #323e43 !default;
 
 $explain-sev-2-bg: #ded17e;
 $explain-sev-3-bg: #824d18;
diff --git a/web/pgadmin/static/scss/resources/high_contrast/_theme.variables.scss b/web/pgadmin/static/scss/resources/high_contrast/_theme.variables.scss
index 65d80cbc3..682f2622b 100644
--- a/web/pgadmin/static/scss/resources/high_contrast/_theme.variables.scss
+++ b/web/pgadmin/static/scss/resources/high_contrast/_theme.variables.scss
@@ -96,7 +96,7 @@ $color-editor-comment: #FFAD65;
 $color-editor-bracket: #D6AAAA;
 $color-editor-operator: $color-fg;
 $color-editor-foldmarker: #FFFFFF;
-$color-editor-activeline: #50B0F0;
+$color-editor-activeline: #063057;
 
 $active-color: $color-fg;
 $active-border: 3px solid $color-primary;
diff --git a/web/pgadmin/tools/debugger/static/scss/_debugger.scss b/web/pgadmin/tools/debugger/static/scss/_debugger.scss
index 30ace0af7..505edd2c0 100644
--- a/web/pgadmin/tools/debugger/static/scss/_debugger.scss
+++ b/web/pgadmin/tools/debugger/static/scss/_debugger.scss
@@ -1,6 +1,3 @@
-.debugger-container .CodeMirror-activeline-background {
-  background: $color-editor-activeline;
-}
 
 /* To make font same as Query tool in messages tab */
 .messages {
diff --git a/web/pgadmin/tools/sqleditor/static/scss/_sqleditor.scss b/web/pgadmin/tools/sqleditor/static/scss/_sqleditor.scss
index 9d5ba4deb..0bb408021 100644
--- a/web/pgadmin/tools/sqleditor/static/scss/_sqleditor.scss
+++ b/web/pgadmin/tools/sqleditor/static/scss/_sqleditor.scss
@@ -59,10 +59,6 @@
   right: 0;
 }
 
-#editor-panel .CodeMirror-activeline-background {
-  background: $color-primary-light;
-}
-
 
 .ajs-body .warn-icon {
   color: $color-warning;