diff --git a/qml/ClideTreeView.qml b/qml/ClideTreeView.qml
index 8847df5..79ac44d 100644
--- a/qml/ClideTreeView.qml
+++ b/qml/ClideTreeView.qml
@@ -57,9 +57,7 @@ TreeView {
         indentation: 12
 
         background: Rectangle {
-            // TODO: Fix flickering from color transition on states here.
-            color: (treeDelegate.index === fileSystemTreeView.lastIndex) ? RustColors.explorer_text_selected : (hoverHandler.hovered ? RustColors.explorer_hovered : "transparent")
-            opacity: hoverHandler.hovered ? 0.75 : 1.0
+            color: "transparent"
             radius: 2.5
 
             Behavior on color {
@@ -128,6 +126,7 @@ TreeView {
                 switch (button) {
                 case Qt.LeftButton:
                     fileSystemTreeView.toggleExpanded(treeDelegate.row);
+                    fileSystemTreeView.lastIndex = treeDelegate.index
                     // If this model item doesn't have children, it means it's
                     // representing a file.
                     if (!treeDelegate.hasChildren)