diff --git a/docs/en_US/release_notes_4_21.rst b/docs/en_US/release_notes_4_21.rst
index d0d3b4f04..14e69f245 100644
--- a/docs/en_US/release_notes_4_21.rst
+++ b/docs/en_US/release_notes_4_21.rst
@@ -36,6 +36,7 @@ Bug fixes
 | `Issue #3947 <https://redmine.postgresql.org/issues/3947>`_ -  Fixed copy-paste row issues in View/Edit Data.
 | `Issue #3972 <https://redmine.postgresql.org/issues/3972>`_ -  Modified keyboard shortcuts in Query Tool for OSX native support.
 | `Issue #3988 <https://redmine.postgresql.org/issues/3988>`_ -  Fixed cursor disappeared issue in the query editor for some of the characters when zoomed out.
+| `Issue #4108 <https://redmine.postgresql.org/issues/4108>`_ -  Fixed mouse click issue where it does not select an object in Browser unless the pointer is over the object.
 | `Issue #4206 <https://redmine.postgresql.org/issues/4206>`_ -  Ensure that the grant wizard should be closed on pressing the ESC key.
 | `Issue #4292 <https://redmine.postgresql.org/issues/4292>`_ -  Added dark mode support for the configuration dialog on Windows/macOS runtime.
 | `Issue #4440 <https://redmine.postgresql.org/issues/4440>`_ -  Ensure the DROP statements in reverse engineered SQL are properly quoted for all objects.
diff --git a/web/pgadmin/browser/static/js/browser.js b/web/pgadmin/browser/static/js/browser.js
index 4ed30a26a..800bd30c8 100644
--- a/web/pgadmin/browser/static/js/browser.js
+++ b/web/pgadmin/browser/static/js/browser.js
@@ -98,6 +98,7 @@ define('pgadmin.browser', [
         },
         animateRoot: true,
         unanimated: false,
+        fullRow: true,
       });
 
       b.tree = $('#tree').aciTree('api');
diff --git a/web/pgadmin/preferences/static/js/preferences.js b/web/pgadmin/preferences/static/js/preferences.js
index 7e097233e..b43106bbb 100644
--- a/web/pgadmin/preferences/static/js/preferences.js
+++ b/web/pgadmin/preferences/static/js/preferences.js
@@ -400,6 +400,7 @@ define('pgadmin.preferences', [
             jTree.aciTree({
               selectable: true,
               expand: true,
+              fullRow: true,
               ajax: {
                 url: url_for('preferences.index'),
               },
diff --git a/web/pgadmin/static/scss/_aci_tree.overrides.scss b/web/pgadmin/static/scss/_aci_tree.overrides.scss
index adabf1ac7..88e0d92c4 100644
--- a/web/pgadmin/static/scss/_aci_tree.overrides.scss
+++ b/web/pgadmin/static/scss/_aci_tree.overrides.scss
@@ -8,129 +8,145 @@
   border-style: none;
 }
 
-.aciTree {
+.aciTree, .aciTree.aciTreeFullRow {
     & .aciTreeButton, & .aciTreePush, & .aciTreeItem, & .aciTreeIcon, & .aciTreeText, & .aciTreeColumn {
         color: $color-fg;
     }
-}
 
-.aciTree .aciTreeLi {
-  display: grid !important;
-  cursor: pointer;
-}
-.aciTree .aciTreeText {
-	font-family: $font-family-primary;
-	font-size: $tree-font-size;
-}
+    .aciTreeLi {
+      display: grid !important;
+      cursor: pointer;
+    }
 
-.aciTree .aciTreeSelected > .aciTreeLine {
-  background-color: $tree-bg-selected !important;
-	border-color: $color-primary-light;
-	border-right: $active-border !important;
-	border-left: none !important;
-	border-top: none !important;
-	border-bottom: none !important;
-  -webkit-border-radius: none !important;
-  -moz-border-radius: none !important;
-  border-radius: none !important;
+    .aciTreeText {
+      font-family: $font-family-primary !important;
+      font-size: $tree-font-size !important;
+    }
 
-  & .aciTreeItem {
-      background-color: $tree-bg-selected;
-      border: 1px solid transparent;
-      -webkit-border-radius: none !important;
-      -moz-border-radius: none !important;
-      border-radius: none !important;
-      color: $tree-fg-selected;
-  }
-}
-.aciTree .aciTreeItem {
-	white-space: nowrap !important;
-}
-.aciTree.aciTreeLoad {
-	background: none;
-}
-.aciTree .aciTreeLine.aciTreeHover {
-  background-color: $tree-bg-hover;
-  -webkit-border-radius: none !important;
-  -moz-border-radius: none !important;
-  border-radius: none !important;
-    & .aciTreeItem {
-        background-color: inherit;
-        border: 1px solid transparent;
+    .aciTreeUl {
+        list-style: none;
+        margin: 0;
+        padding: 0;
+    }
+    .aciTreeLine {
+      margin: unset !important;
+      border: unset !important;
+    }
+
+    .aciTreeSelected > .aciTreeLine {
+        background: unset !important;
+        background-color: $tree-bg-selected !important;
+        border-color: $color-primary-light;
+        border-right: $active-border !important;
+        border-left: none !important;
+        border-top: none !important;
+        border-bottom: none !important;
         -webkit-border-radius: none !important;
         -moz-border-radius: none !important;
         border-radius: none !important;
-        color: $tree-fg-hover;
-    }
-}
 
-.aciTree.aciTreeFocus {
-
-    & .aciTreeFocus > .aciTreeLine  {
-      background-color: $tree-bg-selected !important;
-        border-right: $active-border !important;
+        & .aciTreeItem {
+            background-color: $tree-bg-selected;
+            border: 1px solid transparent;
+            -webkit-border-radius: none !important;
+            -moz-border-radius: none !important;
+            border-radius: none !important;
+            color: $tree-fg-selected;
+        }
     }
 
-    & .aciTreeSelected >.aciTreeLine .aciTreeItem {
-      background-color: $tree-bg-selected;
+    .aciTreeItem {
+      white-space: nowrap !important;
     }
 
-    & .aciTreeFocus >.aciTreeLine .aciTreeItem,
-    & .aciTreeSelected.aciTreeFocus >.aciTreeLine .aciTreeItem {
-      border: 1px solid transparent;
-      color: $tree-fg-selected;
+    &.aciTreeLoad {
+      background: none;
+    }
+
+    .aciTreeLine.aciTreeHover {
+        background: unset !important;
+        background-color: $tree-bg-hover !important;
+        -webkit-border-radius: none !important;
+        -moz-border-radius: none !important;
+        border-radius: none !important;
+        & .aciTreeItem {
+            background-color: inherit;
+            border: 1px solid transparent;
+            -webkit-border-radius: none !important;
+            -moz-border-radius: none !important;
+            border-radius: none !important;
+            color: $tree-fg-hover;
+        }
+    }
+
+    &.aciTreeFocus {
+
+        & .aciTreeFocus > .aciTreeLine  {
+          background-color: $tree-bg-selected !important;
+          border-right: $active-border !important;
+        }
+
+        & .aciTreeSelected >.aciTreeLine .aciTreeItem {
+          background-color: $tree-bg-selected;
+        }
+
+        & .aciTreeFocus >.aciTreeLine .aciTreeItem,
+        & .aciTreeSelected.aciTreeFocus >.aciTreeLine .aciTreeItem {
+          border: 1px solid transparent;
+          color: $tree-fg-selected;
+        }
+    }
+
+    .aciTreeButton {
+      background: none;
+    }
+
+    .aciTreePush {
+      background: none;
+      text-align: center;
+      vertical-align: middle;
+      font-size: 0.85em;
+    }
+
+    .aciTreeEntry, .aciTreeBranch, &[dir=rtl] .aciTreeBranch {
+        overflow:hidden;
+        background: none !important;
+    }
+
+    .aciTreeInode>.aciTreeLine .aciTreePush {
+        &:before,
+        &.aciTreeHover:before {
+          background-position: 6px center !important;
+          font-family: $font-family-icon;
+          content: "\f054" !important;
+          border-style: none;
+          margin-left: 5px;
+        }
+    }
+
+    .aciTreeLoad>.aciTreeLine .aciTreePush {
+        &:before,
+        &.aciTreeHover:before {
+          content: " " !important;
+        }
+    }
+
+    .aciTreeOpen >.aciTreeLine .aciTreePush {
+        &:before,
+        &.aciTreeHover:before {
+          background-position: -14px center !important;
+          font-family: $font-family-icon;
+          content: "\f078" !important;
+          border-style: none;
+          margin-left: 5px;
+        }
+    }
+
+    .aciTreePush>span {
+        width: 15px;
+        height: 15px;
+        left: 2px;
+        background: $loader-icon-small 0 0 no-repeat;
+        background-color: inherit!important;
     }
 }
-
-.aciTree .aciTreeButton {
-  background: none;
-}
-.aciTree .aciTreePush {
-  background: none;
-  text-align: center;
-  font-size: 0.85em;
-}
-.aciTree .aciTreeEntry,
-.aciTree .aciTreeBranch,
-.aciTree[dir=rtl] .aciTreeBranch {
-    overflow:hidden;
-    background: none !important;
-}
-
-
-.aciTree .aciTreeInode>.aciTreeLine .aciTreePush {
-    &:before,
-    &.aciTreeHover:before {
-      background-position: 6px center !important;
-      font-family: $font-family-icon;
-      content: "\f054" !important;
-      border-style: none;
-      margin-left: 5px;
-    }
-}
-
-.aciTree .aciTreeLoad>.aciTreeLine .aciTreePush {
-    &:before,
-    &.aciTreeHover:before {
-      content: " " !important;
-    }
-}
-
-.aciTree .aciTreeOpen >.aciTreeLine .aciTreePush {
-    &:before,
-    &.aciTreeHover:before {
-      background-position: -14px center !important;
-      font-family: $font-family-icon;
-      content: "\f078" !important;
-      border-style: none;
-      margin-left: 5px;
-    }
-}
-
-.aciTree .aciTreePush>span {
-    width: 15px;
-    height: 15px;
-    left: 2px;
-    background: $loader-icon-small 0 0 no-repeat;
-    background-color: inherit!important;
-}