diff --git a/Frameworks/Find/src/FindWindowController.mm b/Frameworks/Find/src/FindWindowController.mm
index e2dbfeba..e10cd4d3 100644
--- a/Frameworks/Find/src/FindWindowController.mm
+++ b/Frameworks/Find/src/FindWindowController.mm
@@ -177,10 +177,11 @@ static NSProgressIndicator* OakCreateProgressIndicator ()
 	NSRect r = [[NSScreen mainScreen] visibleFrame];
 	if((self = [super initWithWindow:[[NSPanel alloc] initWithContentRect:NSMakeRect(NSMidX(r)-100, NSMidY(r)+100, 200, 200) styleMask:(NSTitledWindowMask|NSClosableWindowMask|NSResizableWindowMask|NSMiniaturizableWindowMask) backing:NSBackingStoreBuffered defer:NO]]))
 	{
-		self.window.title             = @"Find";
-		self.window.frameAutosaveName = @"Find";
-		self.window.hidesOnDeactivate = NO;
-		self.window.delegate          = self;
+		self.window.title              = @"Find";
+		self.window.frameAutosaveName  = @"Find";
+		self.window.hidesOnDeactivate  = NO;
+		self.window.collectionBehavior = self.window.collectionBehavior | NSWindowCollectionBehaviorMoveToActiveSpace;
+		self.window.delegate           = self;
 
 		self.findLabel                 = OakCreateLabel(@"Find:");
 		self.findTextField             = OakCreateTextField(self);
diff --git a/Frameworks/HTMLOutputWindow/src/HTMLOutputWindow.mm b/Frameworks/HTMLOutputWindow/src/HTMLOutputWindow.mm
index 8655e3c9..fb2f3195 100644
--- a/Frameworks/HTMLOutputWindow/src/HTMLOutputWindow.mm
+++ b/Frameworks/HTMLOutputWindow/src/HTMLOutputWindow.mm
@@ -33,6 +33,7 @@ static std::multimap<oak::uuid_t, HTMLOutputWindowController*> Windows;
 		[self.window setReleasedWhenClosed:NO];
 		[self.window setAutorecalculatesContentBorderThickness:NO forEdge:NSMinYEdge];
 		[self.window setContentBorderThickness:25 forEdge:NSMinYEdge];
+		[self.window setCollectionBehavior:[self.window collectionBehavior] | NSWindowCollectionBehaviorMoveToActiveSpace];
 
 		[OakWindowFrameHelper windowFrameHelperWithWindow:self.window];