diff --git a/src/components/Questions/QuestionDropdown.vue b/src/components/Questions/QuestionDropdown.vue
index e128031fe..b0f3bf091 100644
--- a/src/components/Questions/QuestionDropdown.vue
+++ b/src/components/Questions/QuestionDropdown.vue
@@ -55,7 +55,7 @@
 				handle=".option__drag-handle"
 				invertSwap
 				target=".sort-target"
-				@change="saveOptionsOrder('choice')"
+				@update="dirtyOptionsType = 'choice'"
 				@start="onDragStart"
 				@end="onDragEnd">
 				<TransitionGroup
diff --git a/src/components/Questions/QuestionGrid.vue b/src/components/Questions/QuestionGrid.vue
index 97d017acd..642d3680b 100644
--- a/src/components/Questions/QuestionGrid.vue
+++ b/src/components/Questions/QuestionGrid.vue
@@ -101,7 +101,7 @@
 					handle=".option__drag-handle"
 					invertSwap
 					target=".sort-target"
-					@change="saveOptionsOrder('column')"
+					@update="dirtyOptionsType = 'column'"
 					@start="onDragStart"
 					@end="onDragEnd">
 					<!-- Column input edit -->
@@ -139,7 +139,7 @@
 					handle=".option__drag-handle"
 					invertSwap
 					target=".sort-target"
-					@change="saveOptionsOrder('row')"
+					@update="dirtyOptionsType = 'row'"
 					@start="onDragStart"
 					@end="onDragEnd">
 					<TransitionGroup
diff --git a/src/components/Questions/QuestionMultiple.vue b/src/components/Questions/QuestionMultiple.vue
index 67d30ee44..a6d4ae723 100644
--- a/src/components/Questions/QuestionMultiple.vue
+++ b/src/components/Questions/QuestionMultiple.vue
@@ -126,7 +126,7 @@
 				handle=".option__drag-handle"
 				invertSwap
 				target=".sort-target"
-				@change="saveOptionsOrder('choice')"
+				@update="dirtyOptionsType = 'choice'"
 				@start="onDragStart"
 				@end="onDragEnd">
 				<TransitionGroup
diff --git a/src/components/Questions/QuestionRanking.vue b/src/components/Questions/QuestionRanking.vue
index 181369af3..beb7473af 100644
--- a/src/components/Questions/QuestionRanking.vue
+++ b/src/components/Questions/QuestionRanking.vue
@@ -141,7 +141,7 @@
 				handle=".option__drag-handle"
 				invertSwap
 				target=".sort-target"
-				@change="saveOptionsOrder('choice')"
+				@update="dirtyOptionsType = 'choice'"
 				@start="onDragStart"
 				@end="onDragEnd">
 				<TransitionGroup
diff --git a/src/views/Create.vue b/src/views/Create.vue
index 05736f05a..9c7e98b3c 100644
--- a/src/views/Create.vue
+++ b/src/views/Create.vue
@@ -121,7 +121,7 @@
 					direction="vertical"
 					invertSwap
 					handle=".question__drag-handle"
-					@change="onQuestionOrderChange"
+					@update="onQuestionOrderChange"
 					@start="onDragStart"
 					@end="onDragEnd">
 					<TransitionGroup