diff --git a/editor/src/document/document_file.rs b/editor/src/document/document_file.rs
index 4d7142e66f..6a5cda3494 100644
--- a/editor/src/document/document_file.rs
+++ b/editor/src/document/document_file.rs
@@ -275,6 +275,7 @@ impl DocumentMessageHandler {
 
 	pub fn selected_layers_without_children(&self) -> Vec<Vec<LayerId>> {
 		let mut sorted_layers = self.selected_layers().collect::<Vec<_>>();
+		// Sorting here creates groups of similar UUID paths
 		sorted_layers.sort();
 
 		if sorted_layers.is_empty() {
diff --git a/editor/src/document/document_message_handler.rs b/editor/src/document/document_message_handler.rs
index 56e1adae01..052c408112 100644
--- a/editor/src/document/document_message_handler.rs
+++ b/editor/src/document/document_message_handler.rs
@@ -366,6 +366,7 @@ impl MessageHandler<DocumentsMessage, &InputPreprocessor> for DocumentsMessageHa
 						(Err(e), _) => warn!("Could not access selected layer {:?}: {:?}", layer_path, e),
 					}
 				}
+				//responses.push_back(DeselectAllLayers.into());
 			}
 			Cut(clipboard) => {
 				responses.push_back(Copy(clipboard).into());
@@ -373,16 +374,12 @@ impl MessageHandler<DocumentsMessage, &InputPreprocessor> for DocumentsMessageHa
 			}
 			Paste(clipboard) => {
 				let document = self.active_document();
-				let mut shallowest_common_folder = document
+				let shallowest_common_folder = document
 					.graphene_document
 					.shallowest_common_folder(document.selected_layers())
 					.expect("While pasting, the selected layers did not exist while attempting to find the appropriate folder path for insertion");
 
-				// We want to paste folders at the same depth as their copy source
-				if !shallowest_common_folder.is_empty() && document.selected_layers_contains(shallowest_common_folder) {
-					shallowest_common_folder = &shallowest_common_folder[..shallowest_common_folder.len() - 1];
-				}
-
+				responses.push_back(StartTransaction.into());
 				responses.push_back(
 					PasteIntoFolder {
 						clipboard,
@@ -391,6 +388,7 @@ impl MessageHandler<DocumentsMessage, &InputPreprocessor> for DocumentsMessageHa
 					}
 					.into(),
 				);
+				responses.push_back(CommitTransaction.into());
 			}
 			PasteIntoFolder { clipboard, path, insert_index } => {
 				let paste = |entry: &CopyBufferEntry, responses: &mut VecDeque<_>| {