diff --git a/src/callback.c b/src/callback.c
index 411ca8a0..051913a2 100644
--- a/src/callback.c
+++ b/src/callback.c
@@ -1144,12 +1144,13 @@ int rstate; /* (reduced state, without ShiftMask) */
  switch(event)
  {
   case LeaveNotify:
-    draw_crosshair(1);
+    if(draw_xhair) draw_crosshair(1);
+    tclvareval(xctx->top_path, ".drw configure -cursor {}" , NULL);
     xctx->mouse_inside = 0;
     break;
   case EnterNotify:
     xctx->mouse_inside = 1;
-    if(tclgetboolvar("draw_crosshair"))
+    if(draw_xhair)
       tclvareval(xctx->top_path, ".drw configure -cursor none" , NULL);
     else 
       tclvareval(xctx->top_path, ".drw configure -cursor {}" , NULL);
diff --git a/src/xschem.tcl b/src/xschem.tcl
index e6db2fe0..dbac3f3c 100644
--- a/src/xschem.tcl
+++ b/src/xschem.tcl
@@ -5765,7 +5765,7 @@ global env has_x OS autofocus_mainwindow
     bind $topwin <Leave> "
       xschem callback %W %T %x %y 0 0 0 %s
       graph_show_measure stop
-      $topwin configure -cursor {}
+      # $topwin configure -cursor {}
     "
     bind $topwin <Expose> "xschem callback %W %T %x %y 0 %w %h %s"
     bind $topwin <Double-Button-1> "xschem callback %W -3 %x %y 0 %b 0 %s"
@@ -5779,7 +5779,7 @@ global env has_x OS autofocus_mainwindow
     if {$autofocus_mainwindow} {
       bind $topwin <Motion> "focus $topwin; xschem callback %W %T %x %y 0 0 0 %s"
       bind $topwin <Enter> "
-         if {\$draw_crosshair} {$topwin configure -cursor none}
+         # if {\$draw_crosshair} {$topwin configure -cursor none}
          destroy .ctxmenu
          focus $topwin
          xschem callback %W %T %x %y 0 0 0 0