diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
index ad13688fdf..d52b69c9e3 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
@@ -73,18 +73,18 @@ ve.ui.MWMediaDialog.static.actions = [
 	{
 		action: 'cancelchoose',
 		label: OO.ui.deferMsg( 'visualeditor-dialog-media-goback' ),
-		flags: 'safe',
+		flags: [ 'safe', 'back' ],
 		modes: [ 'info' ]
 	},
 	{
 		label: OO.ui.deferMsg( 'visualeditor-dialog-action-cancel' ),
-		flags: 'safe',
+		flags: [ 'safe', 'back' ],
 		modes: [ 'edit', 'insert', 'select' ]
 	},
 	{
 		action: 'back',
 		label: OO.ui.deferMsg( 'visualeditor-dialog-media-goback' ),
-		flags: 'safe',
+		flags: [ 'safe', 'back' ],
 		modes: [ 'change' ]
 	}
 ];
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
index e374a55952..60a718097d 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
@@ -42,7 +42,7 @@ ve.ui.MWMetaDialog.static.actions = [
 	},
 	{
 		label: OO.ui.deferMsg( 'visualeditor-dialog-action-cancel' ),
-		flags: 'safe'
+		flags: [ 'safe', 'back' ]
 	}
 ];
 
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
index 4ad2e8296b..8e7aec7711 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
@@ -51,7 +51,7 @@ ve.ui.MWReferenceDialog.static.actions = [
 	},
 	{
 		label: OO.ui.deferMsg( 'visualeditor-dialog-action-cancel' ),
-		flags: 'safe',
+		flags: [ 'safe', 'back' ],
 		modes: [ 'insert', 'edit', 'insert-select' ]
 	},
 	{
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWReferencesListDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWReferencesListDialog.js
index fb0de8c550..2196e50d20 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWReferencesListDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWReferencesListDialog.js
@@ -45,7 +45,7 @@ ve.ui.MWReferencesListDialog.static.actions = [
 	},
 	{
 		label: OO.ui.deferMsg( 'visualeditor-dialog-action-cancel' ),
-		flags: 'safe',
+		flags: [ 'safe', 'back' ],
 		modes: 'edit'
 	}
 ];
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWRequiredParamBlankConfirmDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWRequiredParamBlankConfirmDialog.js
index bee6cd9ea4..4d8569da8d 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWRequiredParamBlankConfirmDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWRequiredParamBlankConfirmDialog.js
@@ -42,7 +42,7 @@ ve.ui.MWRequiredParamBlankConfirmDialog.static.actions = [
 	{
 		action: 'cancel',
 		label: OO.ui.deferMsg( 'visualeditor-dialog-transclusion-required-parameter-dialog-cancel' ),
-		flags: 'safe'
+		flags: [ 'safe', 'back' ]
 	}
 ];
 
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
index aa975d805a..2244c13899 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
@@ -50,7 +50,7 @@ ve.ui.MWSaveDialog.static.actions = [
 	},
 	{
 		label: OO.ui.deferMsg( 'visualeditor-savedialog-label-resume-editing' ),
-		flags: 'safe',
+		flags: [ 'safe', 'back' ],
 		modes: [ 'save', 'conflict' ]
 	},
 	{
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js
index c260640d60..9e9df072f1 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js
@@ -57,7 +57,7 @@ ve.ui.MWTemplateDialog.static.actions = [
 	},
 	{
 		label: OO.ui.deferMsg( 'visualeditor-dialog-action-cancel' ),
-		flags: 'safe',
+		flags: [ 'safe', 'back' ],
 		modes: [ 'insert', 'edit' ]
 	}
 ];
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWWikitextSwitchConfirmDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWWikitextSwitchConfirmDialog.js
index 87a3df2602..1dc0f8b4f3 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWWikitextSwitchConfirmDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWWikitextSwitchConfirmDialog.js
@@ -43,7 +43,7 @@ ve.ui.MWWikitextSwitchConfirmDialog.static.actions = [
 	{
 		action: 'cancel',
 		label: OO.ui.deferMsg( 'visualeditor-mweditmodesource-warning-cancel' ),
-		flags: 'safe'
+		flags: [ 'safe', 'back' ]
 	},
 	{
 		action: 'switch',