diff --git a/public/assets/kindeditor/plugins/image/image.js b/public/assets/kindeditor/plugins/image/image.js
index 69029eda5..fd7f5a501 100644
--- a/public/assets/kindeditor/plugins/image/image.js
+++ b/public/assets/kindeditor/plugins/image/image.js
@@ -215,7 +215,51 @@ KindEditor.plugin('image', function(K) {
 			}
 		});
 		uploadbutton.fileBox.change(function(e) {
-			localUrlBox.val(uploadbutton.fileBox.val());
+			//localUrlBox.val(uploadbutton.fileBox.val());
+                if (dialog.isLoading) {
+                    return;
+                }
+                // insert local image
+                if (showLocal && showRemote && tabs && tabs.selectedIndex === 1 || !showRemote) {
+                    if (uploadbutton.fileBox.val() == '') {
+                        alert(self.lang('pleaseSelectFile'));
+                        return;
+                    }
+                    dialog.showLoading(self.lang('uploadLoading'));
+                    uploadbutton.submit();
+                    localUrlBox.val('');
+                    return;
+                }
+                // insert remote image
+                var url = K.trim(urlBox.val()),
+                    width = widthBox.val(),
+                    height = heightBox.val(),
+                    title = titleBox.val(),
+                    align = '';
+                alignBox.each(function() {
+                    if (this.checked) {
+                        align = this.value;
+                        return false;
+                    }
+                });
+                if (url == 'http://' || K.invalidUrl(url)) {
+                    alert(self.lang('invalidUrl'));
+                    urlBox[0].focus();
+                    return;
+                }
+                if (!/^\d*$/.test(width)) {
+                    alert(self.lang('invalidWidth'));
+                    widthBox[0].focus();
+                    return;
+                }
+                if (!/^\d*$/.test(height)) {
+                    alert(self.lang('invalidHeight'));
+                    heightBox[0].focus();
+                    return;
+                }
+                clickFn.call(self, url, title, width, height, 0, align);
+
+
 		});
 		if (allowFileManager) {
 			viewServerBtn.click(function(e) {