diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index 90769d56..afc4cbd5 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -2009,8 +2009,6 @@ $pathbar_button_checked_bg: if($variant == 'light', #808080, #b8b8b8);
 //
 
 treeview.view {
-  @extend %view;
-
   @at-root * {
     -GtkTreeView-horizontal-separator: 4;
     -GtkTreeView-grid-line-width: 1;
@@ -2029,14 +2027,14 @@ treeview.view {
 
   acceleditor > label { background-color: $selected_bg_color; }
 
+  &:hover { background-color: if($variant=='light', darken($base_color, 3%), lighten($base_color, 3%)); }
+
   &:selected {
-    &, &:focus {
-      border-radius: 0;
-      border-left-color: mix($selected_fg_color, $selected_bg_color, 50%);
-      border-top-color: rgba($fg_color, 0.15); // doesn't work unfortunately
+    border-radius: 0;
+    border-left-color: mix($selected_fg_color, $selected_bg_color, 50%);
+    border-top-color: rgba($fg_color, 0.15); // doesn't work unfortunately
 
-      @extend %selected_items;
-    }
+    @extend %selected_items;
   }
 
   &:disabled {
@@ -2047,9 +2045,13 @@ treeview.view {
     }
   }
 
-  entry {
-    &, &:focus {
-      background-color: $base_color;
+  entry,
+  &:selected entry {
+    background-color: $base_color;
+
+    &:focus {
+      color: $fg_color;
+      background-color: mix(white, $base_color, 8%);
     }
   }
 
@@ -2112,7 +2114,7 @@ treeview.view {
 
   > header {
     > button {
-      $_column_header_color: mix($fg_color,$base_color,80%);
+      $_column_header_color: mix($fg_color, $base_color, 80%);
 
       min-height: if($variant =='light', 24px, 26px);
       min-width: 38px;
@@ -2164,15 +2166,6 @@ treeview.view {
       border-style: none;
     }
   }
-
-  entry, &:selected entry {
-    background-color: $base_color;
-
-    &:focus {
-      color: $fg_color;
-      background-color: mix(white, $base_color, 8%);
-    }
-  }
 }
 
 //
diff --git a/src/sass/gtk/apps/_misc.scss b/src/sass/gtk/apps/_misc.scss
index b740ce11..4dca603b 100644
--- a/src/sass/gtk/apps/_misc.scss
+++ b/src/sass/gtk/apps/_misc.scss
@@ -676,6 +676,15 @@ dialog.background {
   }
 }
 
+treeview#ObjectsTreeView.view {
+  transition: none;
+
+  &:selected {
+    background-color: rgba($selected_bg_color, 0.35);
+    color: $fg_color;
+  }
+}
+
 //
 // Synaptic
 //