diff --git a/src/gui/Cursor.cpp b/src/gui/Cursor.cpp
index 5aa21ad6..f3dc7ea2 100644
--- a/src/gui/Cursor.cpp
+++ b/src/gui/Cursor.cpp
@@ -327,7 +327,7 @@ GdkCursor* Cursor::createHighlighterOrPenCursor(int size, double alpha)
 
 	int height = size;
 	int width = size;
-	if (big)
+	if (big || highlightPosition)
 	{
 		height = width = 100;
 	}
@@ -377,20 +377,21 @@ GdkCursor* Cursor::createHighlighterOrPenCursor(int size, double alpha)
 		cairo_set_source_rgb(cr, 0, 0, 0);
 		cairo_stroke(cr);
 
-		
-		if(highlightPosition) 
+		cairo_fill_preserve(cr);
+	}
+
+	if(highlightPosition) 
 		{
 			// A yellow transparent circle with no border
 			cairo_set_line_width(cr, 0);
 			cairo_set_source_rgba(cr, 255, 255, 0, 0.5);
 			cairo_arc(cr, centerX, centerY, 45, 0, 2 * 3.1415);
-		}
+			cairo_fill_preserve(cr);
+			cairo_set_source_rgb(cr, 0, 0, 0);
+			cairo_stroke(cr);
 
-		cairo_fill_preserve(cr);
 
-		cairo_set_source_rgb(cr, 0, 0, 0);
-		cairo_stroke(cr);
-	}
+		}
 	
 	cairo_set_source_rgba(cr, r, g, b, alpha);
 	// Correct the offset of the coloured dot for big-cursor mode