diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/markdowneditor/markdowneditor.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/markdowneditor/markdowneditor.controller.js
index 8893ebd523..ef5f3efde6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/markdowneditor/markdowneditor.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/markdowneditor/markdowneditor.controller.js
@@ -8,6 +8,28 @@ function MarkdownEditorController($scope, assetsService, dialogService, $timeout
         $scope.model.value = $scope.model.config.defaultValue;
     }
 
+    function openMediaPicker(callback) {
+
+      $scope.mediaPickerOverlay = {};
+      $scope.mediaPickerOverlay.view = "mediaPicker";
+      $scope.mediaPickerOverlay.show = true;
+
+      $scope.mediaPickerOverlay.submit = function(model) {
+
+          var selectedImagePath = model.selectedImages[0].image;
+          callback(selectedImagePath);
+
+          $scope.mediaPickerOverlay.show = false;
+          $scope.mediaPickerOverlay = null;
+      };
+
+      $scope.mediaPickerOverlay.close = function(model) {
+          $scope.mediaPickerOverlay.show = false;
+          $scope.mediaPickerOverlay = null;
+      };
+
+    }
+
     assetsService
         .load([
             "lib/markdown/markdown.converter.js",
@@ -29,15 +51,10 @@ function MarkdownEditorController($scope, assetsService, dialogService, $timeout
 
                     //subscribe to the image dialog clicks
                     editor2.hooks.set("insertImageDialog", function (callback) {
-
-                        dialogService.mediaPicker({
-                            callback: function (data) {
-                                callback(data.image);
-                            }
-                        });
-
+                        openMediaPicker(callback);
                         return true; // tell the editor that we'll take care of getting the image url
                     });
+
                 }, 200);
             });
 
@@ -46,4 +63,4 @@ function MarkdownEditorController($scope, assetsService, dialogService, $timeout
         })
 }
 
-angular.module("umbraco").controller("Umbraco.PropertyEditors.MarkdownEditorController", MarkdownEditorController);
\ No newline at end of file
+angular.module("umbraco").controller("Umbraco.PropertyEditors.MarkdownEditorController", MarkdownEditorController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/markdowneditor/markdowneditor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/markdowneditor/markdowneditor.html
index 482a0ae1cc..64ea1e8e2b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/markdowneditor/markdowneditor.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/markdowneditor/markdowneditor.html
@@ -1,7 +1,15 @@
-<div ng-controller="Umbraco.PropertyEditors.MarkdownEditorController" class="wmd-panel">
-    <div id="wmd-button-bar-{{model.alias}}"></div>
-    
-    <textarea ng-model="model.value" class="wmd-input" id="wmd-input-{{model.alias}}"></textarea>
-    
-    <div ng-show="model.config.preview" id="wmd-preview-{{model.alias}}" class="wmd-panel wmd-preview"></div>
-</div> 
\ No newline at end of file
+<div class="wmd-panel" ng-controller="Umbraco.PropertyEditors.MarkdownEditorController">
+   <div id="wmd-button-bar-{{model.alias}}"></div>
+
+   <textarea class="wmd-input" id="wmd-input-{{model.alias}}" ng-model="model.value"></textarea>
+
+   <div class="wmd-panel wmd-preview" id="wmd-preview-{{model.alias}}" ng-show="model.config.preview"></div>
+
+   <umb-overlay
+      ng-if="mediaPickerOverlay.show"
+      model="mediaPickerOverlay"
+      position="right"
+      view="mediaPickerOverlay.view">
+   </umb-overlay>
+
+</div>