diff --git a/extension.json b/extension.json
index 063e2bff42..4884d6fab0 100644
--- a/extension.json
+++ b/extension.json
@@ -589,13 +589,15 @@
 				"newsectionsummary",
 				"pagecategories",
 				"parentheses",
+				"redirectto",
 				"tooltip-minoredit",
 				"tooltip-watch",
 				"visualeditor-autosave-not-recovered-text",
 				"visualeditor-autosave-not-recovered-title",
 				"visualeditor-autosave-recovered-text",
 				"visualeditor-autosave-recovered-title",
-				"visualeditor-diff-no-changes"
+				"visualeditor-diff-no-changes",
+				"visualeditor-redirect-description"
 			],
 			"targets": [
 				"desktop",
@@ -1686,8 +1688,6 @@
 				"mediawiki.action.view.redirectPage"
 			],
 			"messages": [
-				"redirectto",
-
 				"visualeditor-advancedsettings-tool",
 				"visualeditor-categories-tool",
 				"visualeditor-dialog-meta-advancedsettings-label",
@@ -1752,7 +1752,6 @@
 				"visualeditor-dialogbutton-meta-tooltip",
 				"visualeditor-languages-tool",
 				"visualeditor-meta-tool",
-				"visualeditor-redirect-description",
 				"visualeditor-settings-tool",
 				"visualeditor-templatesused-tool"
 			],
diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
index 85c838c687..b60fbd493a 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -1654,106 +1654,6 @@ ve.init.mw.DesktopArticleTarget.prototype.resetDocumentOpacity = function () {
 	this.getSurface().getView().getDocument().getDocumentNode().$element.css( 'opacity', 1 );
 };
 
-/**
- * Return DOM for the redirect page subtitle (#redirectsub).
- *
- * @return {jQuery}
- */
-ve.init.mw.DesktopArticleTarget.prototype.buildRedirectSub = function () {
-	// Page subtitle
-	// Compare: Article::view()
-	return $( '<span>' )
-		.attr( 'id', 'redirectsub' )
-		.append( mw.message( 'redirectpagesub' ).parseDom() );
-};
-
-/**
- * Return DOM for the redirect page content header (.redirectMsg).
- *
- * @param {string} title Redirect target
- * @return {jQuery}
- */
-ve.init.mw.DesktopArticleTarget.prototype.buildRedirectMsg = function ( title ) {
-	var target = this,
-		$link;
-
-	$link = $( '<a>' )
-		.attr( 'title', mw.msg( 'visualeditor-redirect-description', title ) )
-		.text( title );
-	ve.init.platform.linkCache.styleElement( title, $link );
-
-	// Page content header
-	// Compare: Article::getRedirectHeaderHtml()
-	return $( '<div>' )
-		.addClass( 'redirectMsg' )
-		// We need to be able to tell apart the real one and our fake one
-		.addClass( 've-redirect-header' )
-		// Hack: This is normally inside #mw-content-text, but we insert it before, so we need this.
-		.addClass( 'mw-content-' + $( 'html' ).attr( 'dir' ) )
-		.append(
-			$( '<p>' ).text( mw.msg( 'redirectto' ) ),
-			$( '<ul>' )
-				.addClass( 'redirectText' )
-				.append( $( '<li>' ).append( $link ) )
-		)
-		.click( function ( e ) {
-			var windowAction = ve.ui.actionFactory.create( 'window', target.getSurface() );
-			windowAction.open( 'meta', { page: 'settings' } );
-			e.preventDefault();
-		} );
-};
-
-/**
- * Display the given redirect subtitle and redirect page content header on the page.
- *
- * @param {jQuery} $sub Redirect subtitle, see #buildRedirectSub
- * @param {jQuery} $msg Redirect page content header, see #buildRedirectMsg
- */
-ve.init.mw.DesktopArticleTarget.prototype.updateRedirectInterface = function ( $sub, $msg ) {
-	var $currentSub, $currentMsg, $subtitle;
-
-	// For the subtitle, replace the real one with ours.
-	// This is more complicated than it should be because we have to fiddle with the <br>.
-	$currentSub = $( '#redirectsub' );
-	if ( $currentSub.length ) {
-		if ( $sub.length ) {
-			$currentSub.replaceWith( $sub );
-		} else {
-			$currentSub.prev().filter( 'br' ).remove();
-			$currentSub.remove();
-		}
-	} else {
-		$subtitle = $( '#contentSub' );
-		if ( $sub.length ) {
-			if ( $subtitle.children().length ) {
-				$subtitle.append( $( '<br>' ) );
-			}
-			$subtitle.append( $sub );
-		}
-	}
-
-	// For the content header, the real one is hidden, insert ours before it.
-	$currentMsg = $( '.ve-redirect-header' );
-	if ( $currentMsg.length ) {
-		$currentMsg.replaceWith( $msg );
-	} else {
-		// Hack: This is normally inside #mw-content-text, but that's hidden while editing.
-		$( '#mw-content-text' ).before( $msg );
-	}
-};
-
-/**
- * Set temporary redirect interface to match the current state of redirection in the editor.
- *
- * @param {string|null} title Current redirect target, or null if none
- */
-ve.init.mw.DesktopArticleTarget.prototype.setFakeRedirectInterface = function ( title ) {
-	this.updateRedirectInterface(
-		title ? this.buildRedirectSub() : $(),
-		title ? this.buildRedirectMsg( title ) : $()
-	);
-};
-
 /**
  * Set the redirect interface to match the page's redirect state.
  */
diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
index a45182e14d..dcc4cfea2f 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
@@ -226,6 +226,50 @@ ve.init.mw.ArticleTarget.static.parseDocument = function ( documentString, mode,
 	return ve.init.mw.ArticleTarget.super.static.parseDocument.call( this, documentString, mode, section );
 };
 
+/**
+ * Build DOM for the redirect page subtitle (#redirectsub).
+ *
+ * @return {jQuery}
+ */
+ve.init.mw.ArticleTarget.static.buildRedirectSub = function () {
+	// Page subtitle
+	// Compare: Article::view()
+	return $( '<span>' )
+		.attr( 'id', 'redirectsub' )
+		.append( mw.message( 'redirectpagesub' ).parseDom() );
+};
+
+/**
+ * Build DOM for the redirect page content header (.redirectMsg).
+ *
+ * @param {string} title Redirect target
+ * @return {jQuery}
+ */
+ve.init.mw.ArticleTarget.static.buildRedirectMsg = function ( title ) {
+	var $link;
+
+	$link = $( '<a>' )
+		.attr( {
+			href: mw.Title.newFromText( title ).getUrl(),
+			title: mw.msg( 'visualeditor-redirect-description', title )
+		} )
+		.text( title );
+	ve.init.platform.linkCache.styleElement( title, $link );
+
+	// Page content header
+	// Compare: Article::getRedirectHeaderHtml()
+	return $( '<div>' )
+		.addClass( 'redirectMsg' )
+		// Hack: This is normally inside #mw-content-text, but we may insert it before, so we need this.
+		.addClass( 'mw-content-' + mw.config.get( 'wgVisualEditor' ).pageLanguageDir )
+		.append(
+			$( '<p>' ).text( mw.msg( 'redirectto' ) ),
+			$( '<ul>' )
+				.addClass( 'redirectText' )
+				.append( $( '<li>' ).append( $link ) )
+		);
+};
+
 /* Methods */
 
 /**
@@ -2476,3 +2520,76 @@ ve.init.mw.ArticleTarget.prototype.reloadSurface = function ( newMode, dataPromi
 	);
 	this.load( dataPromise );
 };
+
+/**
+ * Display the given redirect subtitle and redirect page content header on the page.
+ *
+ * @param {jQuery} $sub Redirect subtitle, see #buildRedirectSub
+ * @param {jQuery} $msg Redirect page content header, see #buildRedirectMsg
+ */
+ve.init.mw.ArticleTarget.prototype.updateRedirectInterface = function ( $sub, $msg ) {
+	var $currentSub, $currentMsg, $subtitle,
+		target = this;
+
+	// For the subtitle, replace the real one with ours.
+	// This is more complicated than it should be because we have to fiddle with the <br>.
+	$currentSub = $( '#redirectsub' );
+	if ( $currentSub.length ) {
+		if ( $sub.length ) {
+			$currentSub.replaceWith( $sub );
+		} else {
+			$currentSub.prev().filter( 'br' ).remove();
+			$currentSub.remove();
+		}
+	} else {
+		$subtitle = $( '#contentSub' );
+		if ( $sub.length ) {
+			if ( $subtitle.children().length ) {
+				$subtitle.append( $( '<br>' ) );
+			}
+			$subtitle.append( $sub );
+		}
+	}
+
+	if ( $msg.length ) {
+		$msg
+			// We need to be able to tell apart the real one and our fake one
+			.addClass( 've-redirect-header' )
+			.on( 'click', function ( e ) {
+				var windowAction = ve.ui.actionFactory.create( 'window', target.getSurface() );
+				windowAction.open( 'meta', { page: 'settings' } );
+				e.preventDefault();
+			} );
+	}
+	// For the content header, the real one is hidden, insert ours before it.
+	$currentMsg = $( '.ve-redirect-header' );
+	if ( $currentMsg.length ) {
+		$currentMsg.replaceWith( $msg );
+	} else {
+		// Hack: This is normally inside #mw-content-text, but that's hidden while editing.
+		$( '#mw-content-text' ).before( $msg );
+	}
+};
+
+/**
+ * Set temporary redirect interface to match the current state of redirection in the editor.
+ *
+ * @param {string|null} title Current redirect target, or null if none
+ */
+ve.init.mw.ArticleTarget.prototype.setFakeRedirectInterface = function ( title ) {
+	this.updateRedirectInterface(
+		title ? this.constructor.static.buildRedirectSub() : $(),
+		title ? this.constructor.static.buildRedirectMsg( title ) : $()
+	);
+};
+
+/**
+ * Set the redirect interface to match the page's redirect state.
+ */
+ve.init.mw.ArticleTarget.prototype.setRealRedirectInterface = function () {
+	this.updateRedirectInterface(
+		mw.config.get( 'wgIsRedirect' ) ? this.buildRedirectSub() : $(),
+		// Remove our custom content header - the original one in #mw-content-text will be shown
+		$()
+	);
+};