diff --git a/src/kits/tracker/TextWidget.cpp b/src/kits/tracker/TextWidget.cpp
index 48abc92520..1713031a3a 100644
--- a/src/kits/tracker/TextWidget.cpp
+++ b/src/kits/tracker/TextWidget.cpp
@@ -234,7 +234,6 @@ BTextWidget::CheckExpiration()
 			// at least 'doubleClickSpeed' microseconds ellapsed and no click
 			// was registered since.
 			fLastClickedTime = 0;
-			fParams.poseView->SetTextWidgetToCheck(NULL);
 			StartEdit(fParams.bounds, fParams.poseView, fParams.pose);
 		}
 	} else {
@@ -335,7 +334,8 @@ TextViewFilter(BMessage* message, BHandler**, BMessageFilter* filter)
 void
 BTextWidget::StartEdit(BRect bounds, BPoseView* view, BPose* pose)
 {
-	if (!IsEditable())
+	view->SetTextWidgetToCheck(NULL, this);
+	if (!IsEditable() || IsActive())
 		return;
 
 	BEntry entry(pose->TargetModel()->EntryRef());