diff --git a/extension.json b/extension.json
index 0e7317cf..942b477a 100644
--- a/extension.json
+++ b/extension.json
@@ -126,26 +126,22 @@
 				"ext.CodeMirror.lib"
 			]
 		},
-		"ext.CodeMirror.visualEditor.init": {
-			"scripts": [
-				"modules/ve-cm/ve.ui.CodeMirror.init.js"
-			],
-			"styles": [
-				"modules/ve-cm/ve.ui.CodeMirror.init.less"
-			],
-			"messages": [
-				"codemirror-toggle-label"
-			]
-		},
 		"ext.CodeMirror.visualEditor": {
 			"dependencies": [
 				"ext.visualEditor.mwcore",
+				"ext.visualEditor.mwmeta",
 				"mediawiki.api",
 				"user.options"
 			],
 			"scripts": [
 				"modules/ve-cm/ve.ui.CodeMirrorAction.js",
 				"modules/ve-cm/ve.ui.CodeMirrorTool.js"
+			],
+			"styles": [
+				"modules/ve-cm/ve.ui.CodeMirror.less"
+			],
+			"messages": [
+				"codemirror-toggle-label"
 			]
 		}
 	},
@@ -193,7 +189,6 @@
 		},
 		"VisualEditor": {
 			"PluginModules": [
-				"ext.CodeMirror.visualEditor.init",
 				"ext.CodeMirror.visualEditor"
 			]
 		},
diff --git a/resources/modules/ve-cm/ve.ui.CodeMirror.init.js b/resources/modules/ve-cm/ve.ui.CodeMirror.init.js
deleted file mode 100644
index 43518d08..00000000
--- a/resources/modules/ve-cm/ve.ui.CodeMirror.init.js
+++ /dev/null
@@ -1,16 +0,0 @@
-mw.loader.using( 'ext.visualEditor.targetLoader' ).then( function () {
-	mw.libs.ve.targetLoader.addPlugin( function () {
-		var target = ve.init.mw.DesktopArticleTarget;
-		if ( target ) {
-			var groups = target.static.toolbarGroups.concat( target.static.actionGroups );
-			groups.some( function ( group ) {
-				if ( group.name === 'pageMenu' ) {
-					var index = group.include.indexOf( 'changeDirectionality' );
-					group.include.splice( index, 0, 'codeMirror' );
-					return true;
-				}
-				return false;
-			} );
-		}
-	} );
-} );
diff --git a/resources/modules/ve-cm/ve.ui.CodeMirror.init.less b/resources/modules/ve-cm/ve.ui.CodeMirror.less
similarity index 100%
rename from resources/modules/ve-cm/ve.ui.CodeMirror.init.less
rename to resources/modules/ve-cm/ve.ui.CodeMirror.less
diff --git a/resources/modules/ve-cm/ve.ui.CodeMirrorTool.js b/resources/modules/ve-cm/ve.ui.CodeMirrorTool.js
index 5713d9a4..be33f087 100644
--- a/resources/modules/ve-cm/ve.ui.CodeMirrorTool.js
+++ b/resources/modules/ve-cm/ve.ui.CodeMirrorTool.js
@@ -26,7 +26,7 @@ ve.ui.CodeMirrorTool.static.name = 'codeMirror';
 ve.ui.CodeMirrorTool.static.autoAddToCatchall = false;
 ve.ui.CodeMirrorTool.static.title = OO.ui.deferMsg( 'codemirror-toggle-label' );
 ve.ui.CodeMirrorTool.static.icon = 'highlight';
-ve.ui.CodeMirrorTool.static.group = 'codeMirror';
+ve.ui.CodeMirrorTool.static.group = 'utility';
 ve.ui.CodeMirrorTool.static.commandName = 'codeMirror';
 ve.ui.CodeMirrorTool.static.deactivateOnSelect = false;