diff --git a/src/kits/tracker/FindPanel.cpp b/src/kits/tracker/FindPanel.cpp
index 5cfdcfff5d..7a6481da34 100644
--- a/src/kits/tracker/FindPanel.cpp
+++ b/src/kits/tracker/FindPanel.cpp
@@ -2242,11 +2242,12 @@ FindPanel::RestoreWindowState(const BNode *node)
 	BString focusedView;
 	if (node->ReadAttrString("_trk/focusedView", &focusedView) == B_OK) {
 		BView *view = FindView(focusedView.String());
-		if (view) {
+		if (view != NULL) {
 			view->MakeFocus();
 			BTextControl *textControl = dynamic_cast<BTextControl *>(view);
-			if (textControl) {
-				int32 selStart = 0, selEnd = LONG_MAX;
+			if (textControl != NULL && Mode() == kByFormulaItem) {
+				int32 selStart = 0;
+				int32 selEnd = LONG_MAX;
 				node->ReadAttr("_trk/focusedSelStart", B_INT32_TYPE, 0,
 					&selStart, sizeof(selStart));
 				node->ReadAttr("_trk/focusedSelEnd", B_INT32_TYPE, 0,