diff --git a/public/javascripts/jstoolbar/jstoolbar.js b/public/javascripts/jstoolbar/jstoolbar.js
index 064dfec1f..a3ab3510f 100644
--- a/public/javascripts/jstoolbar/jstoolbar.js
+++ b/public/javascripts/jstoolbar/jstoolbar.js
@@ -506,3 +506,19 @@ jsToolBar.prototype.tableMenu = function(fn){
   });
   return false;
 };
+
+/* Embed Image */
+jsToolBar.prototype.EmbedImage = function(e, stag, etag){
+  var textarea = this.textarea;
+  if (e.isTrusted
+    && textarea.selectionStart==textarea.selectionEnd
+    && $(textarea).closest('form').find('input:file.filedrop').length > 0) {
+    handleFileDropEvent.target = textarea;
+    var inputEl = $('input:file.filedrop').first();
+    inputEl.attr("accept", "image/*");
+    inputEl.click();
+    inputEl.attr("accept", "");
+  }else{
+    this.encloseSelection(stag, etag);
+  }
+};
diff --git a/public/javascripts/jstoolbar/markdown.js b/public/javascripts/jstoolbar/markdown.js
index c30de3096..b45999cc5 100644
--- a/public/javascripts/jstoolbar/markdown.js
+++ b/public/javascripts/jstoolbar/markdown.js
@@ -227,7 +227,7 @@ jsToolBar.prototype.elements.img = {
   type: 'button',
   title: 'Image',
   fn: {
-    wiki: function() { this.encloseSelection("![](", ")") }
+    wiki: function(e) { this.EmbedImage(e, "![](", ")") }
   }
 }
 
diff --git a/public/javascripts/jstoolbar/textile.js b/public/javascripts/jstoolbar/textile.js
index 9adc77add..568498c41 100644
--- a/public/javascripts/jstoolbar/textile.js
+++ b/public/javascripts/jstoolbar/textile.js
@@ -226,7 +226,7 @@ jsToolBar.prototype.elements.img = {
   type: 'button',
   title: 'Image',
   fn: {
-    wiki: function() { this.encloseSelection("!", "!") }
+    wiki: function(e) { this.EmbedImage(e, "!", "!") }
   }
 }