diff --git a/src/add-ons/tracker/opentargetfolder/opentargetfolder.cpp b/src/add-ons/tracker/opentargetfolder/opentargetfolder.cpp
index 47109f4701..67935927d8 100644
--- a/src/add-ons/tracker/opentargetfolder/opentargetfolder.cpp
+++ b/src/add-ons/tracker/opentargetfolder/opentargetfolder.cpp
@@ -50,7 +50,7 @@ process_refs(entry_ref directoryRef, BMessage* message, void*)
 			break;
 		}
 
-		BEntry targetEntry(&directoryRef, true);
+		BEntry targetEntry(&ref, true);
 		if (targetEntry.InitCheck() != B_OK) {
 			BAlert* alert = new BAlert("Open Target Folder",
 				"Cannot open target entry. Maybe this link is broken?",
diff --git a/src/kits/tracker/ContainerWindow.cpp b/src/kits/tracker/ContainerWindow.cpp
index 4f5d5a438e..e09c09ef87 100644
--- a/src/kits/tracker/ContainerWindow.cpp
+++ b/src/kits/tracker/ContainerWindow.cpp
@@ -3223,13 +3223,8 @@ BContainerWindow::LoadAddOn(BMessage* message)
 
 	refs->AddMessenger("TrackerViewToken", BMessenger(PoseView()));
 
-	const entry_ref* modelRef = TargetModel()->IsContainer()
-			&& selectionList->ItemAt(0) != NULL
-		? selectionList->ItemAt(0)->TargetModel()->EntryRef()
-		: TargetModel()->EntryRef();
-
 	LaunchInNewThread("Add-on", B_NORMAL_PRIORITY, &AddOnThread, refs,
-		addonRef, *modelRef);
+		addonRef, *TargetModel()->EntryRef());
 }