diff --git a/editor/animation_track_editor.cpp b/editor/animation_track_editor.cpp
index 1ca161bd4347..c6acf99872ee 100644
--- a/editor/animation_track_editor.cpp
+++ b/editor/animation_track_editor.cpp
@@ -4639,6 +4639,10 @@ void AnimationTrackEditor::_update_scroll(double) {
 }
 
 void AnimationTrackEditor::_update_step(double p_new_step) {
+	if (animation.is_null()) {
+		return;
+	}
+
 	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
 	undo_redo->create_action(TTR("Change Animation Step"));
 	float step_value = p_new_step;
diff --git a/editor/gui/editor_spin_slider.cpp b/editor/gui/editor_spin_slider.cpp
index 2e67893facc7..ecbf12fed866 100644
--- a/editor/gui/editor_spin_slider.cpp
+++ b/editor/gui/editor_spin_slider.cpp
@@ -573,8 +573,13 @@ void EditorSpinSlider::_value_focus_exited() {
 		return;
 	}
 
+	if (is_read_only()) {
+		// Spin slider has become read only while it was being edited.
+		return;
+	}
+
 	_evaluate_input_text();
-	// focus is not on the same element after the vlalue_input was exited
+	// focus is not on the same element after the value_input was exited
 	// -> focus is on next element
 	// -> TAB was pressed
 	// -> modal_close was not called
@@ -604,6 +609,10 @@ void EditorSpinSlider::_grabber_mouse_exited() {
 
 void EditorSpinSlider::set_read_only(bool p_enable) {
 	read_only = p_enable;
+	if (read_only && value_input) {
+		value_input->release_focus();
+	}
+
 	queue_redraw();
 }