diff --git a/app/portainer/services/codeMirror.js b/app/portainer/services/codeMirror.js
index 26631373c..ba09e0647 100644
--- a/app/portainer/services/codeMirror.js
+++ b/app/portainer/services/codeMirror.js
@@ -4,6 +4,11 @@ import 'codemirror/mode/yaml/yaml.js';
 import 'codemirror/addon/lint/lint.js';
 import 'codemirror/addon/lint/yaml-lint.js';
 import 'codemirror/addon/display/placeholder.js';
+import 'codemirror/addon/search/search.js';
+import 'codemirror/addon/search/searchcursor.js';
+import 'codemirror/addon/search/jump-to-line.js';
+import 'codemirror/addon/dialog/dialog.js';
+import 'codemirror/addon/dialog/dialog.css';
 
 angular.module('portainer.app').factory('CodeMirrorService', function CodeMirrorService() {
   'use strict';
@@ -12,6 +17,9 @@ angular.module('portainer.app').factory('CodeMirrorService', function CodeMirror
 
   var codeMirrorGenericOptions = {
     lineNumbers: true,
+    extraKeys: {
+      'Alt-F': 'findPersistent',
+    },
   };
 
   var codeMirrorYAMLOptions = {
@@ -19,6 +27,7 @@ angular.module('portainer.app').factory('CodeMirrorService', function CodeMirror
     gutters: ['CodeMirror-lint-markers'],
     lint: true,
     extraKeys: {
+      'Alt-F': 'findPersistent',
       Tab: function (cm) {
         var spaces = Array(cm.getOption('indentUnit') + 1).join(' ');
         cm.replaceSelection(spaces);