diff --git a/packages/Sandblocks-Core/Morph.extension.st b/packages/Sandblocks-Core/Morph.extension.st
index e26332aa..d83d7429 100644
--- a/packages/Sandblocks-Core/Morph.extension.st
+++ b/packages/Sandblocks-Core/Morph.extension.st
@@ -726,6 +726,7 @@ Morph >> storeOn: aStream [
 { #category : #'*Sandblocks-Core' }
 Morph >> submorphIndex [
 
+	self owner ifNil: [^ 1].
 	^ self owner submorphs indexOf: self
 ]
 
diff --git a/packages/Sandblocks-Core/SBCursorText.class.st b/packages/Sandblocks-Core/SBCursorText.class.st
index 8e8184e2..a0c93726 100644
--- a/packages/Sandblocks-Core/SBCursorText.class.st
+++ b/packages/Sandblocks-Core/SBCursorText.class.st
@@ -26,7 +26,7 @@ SBCursorText >> applyCommandIn: anEditor [
 			" applying a command will cause a cursor change, however we are in the middle of a cursor change so prohibit any changes here "
 			currentCommand selectAfter: #none.
 			anEditor do: currentCommand]
-		ifFalse: [anEditor history noMoreMerge]
+		ifFalse: [SBToggledCode comment: '' active: 0 do: {[anEditor history noMoreMerge]}]
 ]
 
 { #category : #'as yet unclassified' }