diff --git a/src/apps/installer/InstallerApp.cpp b/src/apps/installer/InstallerApp.cpp
index a4e72373be6..8f16d340150 100644
--- a/src/apps/installer/InstallerApp.cpp
+++ b/src/apps/installer/InstallerApp.cpp
@@ -10,9 +10,12 @@
 #include <Button.h>
 #include <LayoutBuilder.h>
 #include <Locale.h>
+#include <Roster.h>
 #include <ScrollView.h>
 #include <TextView.h>
 
+#include "tracker_private.h"
+
 
 static const uint32 kMsgAgree = 'agre';
 
@@ -251,7 +254,10 @@ InstallerApp::ReadyToRun()
 	BRect eulaFrame = BRect(0, 0, 600, 450);
 	fEULAWindow = new BWindow(eulaFrame, B_TRANSLATE("README"),
 		B_MODAL_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL, B_NOT_ZOOMABLE
-			| B_NOT_MINIMIZABLE | B_AUTO_UPDATE_SIZE_LIMITS, B_ALL_WORKSPACES);
+			| B_NOT_MINIMIZABLE | B_AUTO_UPDATE_SIZE_LIMITS);
+
+	if (!be_roster->IsRunning(kTrackerSignature))
+		fEULAWindow->SetWorkspaces(B_ALL_WORKSPACES);
 
 	BLayoutBuilder::Group<>(fEULAWindow, B_VERTICAL, 10)
 		.SetInsets(10)
diff --git a/src/apps/installer/InstallerWindow.cpp b/src/apps/installer/InstallerWindow.cpp
index a43fe39826d..251f4f57e3d 100644
--- a/src/apps/installer/InstallerWindow.cpp
+++ b/src/apps/installer/InstallerWindow.cpp
@@ -157,7 +157,7 @@ InstallerWindow::InstallerWindow()
 	:
 	BWindow(BRect(-2000, -2000, -1800, -1800),
 		B_TRANSLATE_SYSTEM_NAME("Installer"), B_TITLED_WINDOW,
-		B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS, B_ALL_WORKSPACES),
+		B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS),
 	fEncouragedToSetupPartitions(false),
 	fDriveSetupLaunched(false),
 	fBootManagerLaunched(false),
@@ -165,6 +165,9 @@ InstallerWindow::InstallerWindow()
 	fWorkerThread(new WorkerThread(this)),
 	fCopyEngineCancelSemaphore(-1)
 {
+	if (!be_roster->IsRunning(kTrackerSignature))
+		SetWorkspaces(B_ALL_WORKSPACES);
+
 	LogoView* logoView = new LogoView();
 
 	fStatusView = new BTextView("statusView", be_plain_font, NULL,