diff --git a/desktop/src/app.rs b/desktop/src/app.rs
index 04383363bd..7e0d943fcc 100644
--- a/desktop/src/app.rs
+++ b/desktop/src/app.rs
@@ -82,7 +82,7 @@ impl App {
 		}
 	}
 
-	fn handle_desktop_frontend_message(&mut self, message: DesktopFrontendMessage) {
+	fn handle_desktop_frontend_message(&mut self, message: DesktopFrontendMessage, responses: &mut Vec<DesktopWrapperMessage>) {
 		match message {
 			DesktopFrontendMessage::ToWeb(messages) => {
 				let Some(bytes) = serialize_frontend_messages(messages) else {
@@ -205,7 +205,7 @@ impl App {
 						to_front: false,
 						select_after_open: true,
 					};
-					self.dispatch_desktop_wrapper_message(message);
+					responses.push(message);
 				}
 			}
 			DesktopFrontendMessage::PersistenceLoadRemainingDocuments => {
@@ -216,7 +216,7 @@ impl App {
 						to_front: true,
 						select_after_open: false,
 					};
-					self.dispatch_desktop_wrapper_message(message);
+					responses.push(message);
 				}
 				for (id, document) in self.persistent_data.documents_after_current() {
 					let message = DesktopWrapperMessage::LoadDocument {
@@ -225,11 +225,11 @@ impl App {
 						to_front: false,
 						select_after_open: false,
 					};
-					self.dispatch_desktop_wrapper_message(message);
+					responses.push(message);
 				}
 				if let Some(id) = self.persistent_data.current_document_id() {
 					let message = DesktopWrapperMessage::SelectDocument { id };
-					self.dispatch_desktop_wrapper_message(message);
+					responses.push(message);
 				}
 			}
 			DesktopFrontendMessage::PersistenceWritePreferences { preferences } => {
@@ -238,14 +238,18 @@ impl App {
 			DesktopFrontendMessage::PersistenceLoadPreferences => {
 				let preferences = self.persistent_data.load_preferences();
 				let message = DesktopWrapperMessage::LoadPreferences { preferences };
-				self.dispatch_desktop_wrapper_message(message);
+				responses.push(message);
 			}
 		}
 	}
 
 	fn handle_desktop_frontend_messages(&mut self, messages: Vec<DesktopFrontendMessage>) {
+		let mut responses = Vec::new();
 		for message in messages {
-			self.handle_desktop_frontend_message(message);
+			self.handle_desktop_frontend_message(message, &mut responses);
+		}
+		for message in responses {
+			self.dispatch_desktop_wrapper_message(message);
 		}
 	}
 
diff --git a/desktop/src/cef/input.rs b/desktop/src/cef/input.rs
index e50871b106..fc8449d8d0 100644
--- a/desktop/src/cef/input.rs
+++ b/desktop/src/cef/input.rs
@@ -246,7 +246,8 @@ impl ClickTracker {
 			return ClickCount::Single;
 		};
 
-		let previous = record.time;
+		let prev_time = record.time;
+		let prev_position = record.position;
 
 		let now = Instant::now();
 		record.time = now;
@@ -270,10 +271,10 @@ impl ClickTracker {
 			_ => {}
 		}
 
-		let dx = position.x.abs_diff(record.position.x);
-		let dy = position.y.abs_diff(record.position.y);
+		let dx = position.x.abs_diff(prev_position.x);
+		let dy = position.y.abs_diff(prev_position.y);
 		let within_dist = dx <= MULTICLICK_ALLOWED_TRAVEL && dy <= MULTICLICK_ALLOWED_TRAVEL;
-		let within_time = now.saturating_duration_since(previous) <= MULTICLICK_TIMEOUT;
+		let within_time = now.saturating_duration_since(prev_time) <= MULTICLICK_TIMEOUT;
 
 		let count = if within_time && within_dist { ClickCount::Double } else { ClickCount::Single };
 
diff --git a/desktop/wrapper/src/message_dispatcher.rs b/desktop/wrapper/src/message_dispatcher.rs
index 3c3852cf12..b568c91b27 100644
--- a/desktop/wrapper/src/message_dispatcher.rs
+++ b/desktop/wrapper/src/message_dispatcher.rs
@@ -71,6 +71,8 @@ impl<'a> DesktopWrapperMessageDispatcher<'a> {
 			frontend_messages.extend(current_frontend_messages);
 		}
 
-		self.respond(DesktopFrontendMessage::ToWeb(frontend_messages));
+		if !frontend_messages.is_empty() {
+			self.respond(DesktopFrontendMessage::ToWeb(frontend_messages));
+		}
 	}
 }
diff --git a/editor/src/messages/portfolio/portfolio_message_handler.rs b/editor/src/messages/portfolio/portfolio_message_handler.rs
index 0e7143a045..cb852eb3bc 100644
--- a/editor/src/messages/portfolio/portfolio_message_handler.rs
+++ b/editor/src/messages/portfolio/portfolio_message_handler.rs
@@ -136,10 +136,12 @@ impl MessageHandler<PortfolioMessage, PortfolioMessageContext<'_>> for Portfolio
 
 			// Messages
 			PortfolioMessage::Init => {
-				// Load persistent data from the browser database
-				responses.add(FrontendMessage::TriggerLoadFirstAutoSaveDocument);
+				// Tell frontend to load persistent preferences
 				responses.add(FrontendMessage::TriggerLoadPreferences);
 
+				// Tell frontend to load the current document
+				responses.add(FrontendMessage::TriggerLoadFirstAutoSaveDocument);
+
 				// Display the menu bar at the top of the window
 				responses.add(MenuBarMessage::SendLayout);
 
@@ -149,7 +151,7 @@ impl MessageHandler<PortfolioMessage, PortfolioMessageContext<'_>> for Portfolio
 					node_types: document_node_definitions::collect_node_types(),
 				});
 
-				// Finish loading persistent data from the browser database
+				// Tell frontend to finish loading persistent documents
 				responses.add(FrontendMessage::TriggerLoadRestAutoSaveDocuments);
 			}
 			PortfolioMessage::DocumentPassMessage { document_id, message } => {