diff --git a/themes/grav/js/mdeditor.js b/themes/grav/js/mdeditor.js
index 76afbd47..7b9e4829 100644
--- a/themes/grav/js/mdeditor.js
+++ b/themes/grav/js/mdeditor.js
@@ -80,7 +80,7 @@
         $("#gravDropzone").delegate('[data-dz-insert]', 'click', function(e) {
             var target = $(e.currentTarget).parent('.dz-preview').find('.dz-filename');
             editor.focus();
-            editor.doc.replaceSelection('![](' + target.text() + ')');
+            editor.doc.replaceSelection('![](' + encodeURI(target.text()) + ')');
         });
 
         this.preview.container = this.preview;
diff --git a/themes/grav/templates/forms/fields/uploads/uploads.html.twig b/themes/grav/templates/forms/fields/uploads/uploads.html.twig
index b221798b..d8ef5071 100644
--- a/themes/grav/templates/forms/fields/uploads/uploads.html.twig
+++ b/themes/grav/templates/forms/fields/uploads/uploads.html.twig
@@ -121,7 +121,7 @@
                 var dropzone = new Dropzone("#gravDropzone", { url: URI + '/task:addmedia', createImageThumbnails: { thumbnailWidth: 150} });
 
                 $("#gravDropzone").delegate('.dz-preview', 'dragstart', function(e){
-                    var uri = $(this).find('.dz-filename').text(), shortcode = '![](' + uri + ')';
+                    var uri = $(this).find('.dz-filename').text(), shortcode = '![](' + encodeURI(uri) + ')';
                     dropzone.disable();
                     $(this).addClass('hide-backface');
                     e.originalEvent.dataTransfer.effectAllowed = 'copy';