diff --git a/src/kits/tracker/AutoMounter.cpp b/src/kits/tracker/AutoMounter.cpp
index b16bd1ca86..460996b6c3 100644
--- a/src/kits/tracker/AutoMounter.cpp
+++ b/src/kits/tracker/AutoMounter.cpp
@@ -459,6 +459,7 @@ AutoMounter::MessageReceived(BMessage *message)
 	switch (message->what) {
 		case kMsgInitialScan:
 			_MountVolumes(fNormalMode, fRemovableMode, true);
+			be_app->PostMessage(kOpenPreviouslyOpenWindows);
 			break;
 
 		case kMountVolume:
@@ -1486,6 +1487,8 @@ AutoMounter::InitialRescan()
 	}
 	
 	sInitialRescan = false;
+
+	be_app->PostMessage(kOpenPreviouslyOpenWindows);
 }
 
 
diff --git a/src/kits/tracker/Commands.h b/src/kits/tracker/Commands.h
index 4131ec6bee..698118b249 100644
--- a/src/kits/tracker/Commands.h
+++ b/src/kits/tracker/Commands.h
@@ -53,6 +53,7 @@ const uint32 kCloseWindowAndChildren = 'Tcwc';
 
 // end external app messages
 
+const uint32 kOpenPreviouslyOpenWindows = 'Topw';
 const uint32 kRestoreState = 'Trst';
 
 const uint32 kCutMoreSelectionToClipboard = 'Tmvm';
diff --git a/src/kits/tracker/Tracker.cpp b/src/kits/tracker/Tracker.cpp
index 7b9cdb8dc5..038d5801fe 100644
--- a/src/kits/tracker/Tracker.cpp
+++ b/src/kits/tracker/Tracker.cpp
@@ -356,6 +356,11 @@ TTracker::MessageReceived(BMessage *message)
 		return;
 
 	switch (message->what) {
+		case kOpenPreviouslyOpenWindows:
+			if (!BootedInSafeMode())
+				_OpenPreviouslyOpenedWindows();
+			break;
+
 		case kGetInfo:
 			OpenInfoWindows(message);
 			break;
@@ -1327,10 +1332,6 @@ TTracker::ReadyToRun()
 			}
 		} else
 			delete model;
-
-		// open previously open windows
-		if (!BootedInSafeMode())
-			_OpenPreviouslyOpenedWindows();
 	}
 
 	// kick off building the mime type list for find panels, etc.