diff --git a/src/tracks/ui/TrackSelectHandle.cpp b/src/tracks/ui/TrackSelectHandle.cpp
index ec5d71781..fc7dc0dfa 100644
--- a/src/tracks/ui/TrackSelectHandle.cpp
+++ b/src/tracks/ui/TrackSelectHandle.cpp
@@ -147,10 +147,14 @@ HitTestPreview TrackSelectHandle::Preview
    static auto disabledCursor =
       ::MakeCursor(wxCURSOR_NO_ENTRY, DisabledCursorXpm, 16, 16);
    //static wxCursor rearrangeCursor{ wxCURSOR_HAND };
-   static auto hoverCursor =
+   static auto rearrangeCursor =
       ::MakeCursor(wxCURSOR_HAND, RearrangeCursorXpm, 16, 16);
-   static auto clickedCursor =
-      ::MakeCursor(wxCURSOR_HAND, RearrangingCursorXpm, 16, 16);
+
+
+   //static auto hoverCursor =
+   //   ::MakeCursor(wxCURSOR_HAND, RearrangeCursorXpm, 16, 16);
+   //static auto clickedCursor =
+   //   ::MakeCursor(wxCURSOR_HAND, RearrangingCursorXpm, 16, 16);
 
    const auto trackCount = TrackList::Get( *project ).Leaders().size();
    auto message = Message(trackCount);
@@ -161,7 +165,7 @@ HitTestPreview TrackSelectHandle::Preview
          message,
          (unsafe
           ? &*disabledCursor
-          : &*clickedCursor)
+          : &*rearrangeCursor)
          // , message // Stop showing the tooltip after the click
       };
    }
@@ -171,7 +175,7 @@ HitTestPreview TrackSelectHandle::Preview
       static wxCursor arrowCursor{ wxCURSOR_ARROW };
       return {
          message,
-         &*hoverCursor,
+         &arrowCursor,
          message
       };
    }