diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/TextCanvas.java b/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/TextCanvas.java
index 7b5fdcce314..72212c55c39 100644
--- a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/TextCanvas.java
+++ b/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/TextCanvas.java
@@ -112,7 +112,7 @@ public class TextCanvas extends GridCanvas {
 	}
 
 	void setSelection(Point p) {
-		if (!p.equals(fDraggingEnd)) {
+		if (fDraggingStart !=null && !p.equals(fDraggingEnd)) {
 			fDraggingEnd = p;
 			if (compare(p, fDraggingStart) < 0) {
 				fCellCanvasModel.setSelection(p.y, fDraggingStart.y, p.x, fDraggingStart.x);