diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js
index 753855f91..51b8dea02 100644
--- a/public/javascripts/attachments.js
+++ b/public/javascripts/attachments.js
@@ -255,4 +255,19 @@ $(document).ready(function(){
   $("input.deleted_attachment").change(function(){
     $(this).parents('.existing-attachment').toggleClass('deleted', $(this).is(":checked"));
   }).change();
+  $(".wiki-edit").on('paste', function(e){
+    var items = e.originalEvent.clipboardData.items;
+    for (var i = 0 ; i < items.length ; i++) {
+      var item = items[i];
+      if (item.type.indexOf("image") != -1) {
+        var blob = item.getAsFile();
+        var urlObj = window.URL || window.webkitURL;
+        var filename = 'paste-' + urlObj.createObjectURL(blob).split('/').pop() + '.' + blob.name.split('.').pop();
+        var file = new File([blob], filename, {type: blob.type});
+        var inputEl = $('input[name="attachments[dummy][file]"]');
+        handleFileDropEvent.target = e.target;
+        addFile(inputEl, file, true);
+      }
+    }
+  });
 });