diff --git a/src/Module/Media/Photo/Upload.php b/src/Module/Media/Photo/Upload.php
index 2032c60143..66dc51e9f8 100644
--- a/src/Module/Media/Photo/Upload.php
+++ b/src/Module/Media/Photo/Upload.php
@@ -163,7 +163,7 @@ class Upload extends \Friendica\BaseModule
 		}
 
 		$this->logger->info('upload done');
-		$this->return(200, "\n\n" . Images::getBBCodeByResource($resource_id, $owner['nickname'], $preview, $image->getExt()) . "\n\n");
+		$this->return(200, Images::getBBCodeByResource($resource_id, $owner['nickname'], $preview, $image->getExt()));
 	}
 
 	/**
diff --git a/view/js/dropzone-factory.js b/view/js/dropzone-factory.js
index bdb2353f1d..dcc0468cb2 100644
--- a/view/js/dropzone-factory.js
+++ b/view/js/dropzone-factory.js
@@ -23,6 +23,10 @@ var DzFactory = function (max_imagesize) {
 			dictRemoveFile: dzStrings.dictRemoveFile,
 			dictMaxFilesExceeded: dzStrings.dictMaxFilesExceeded,
 			accept: function(file, done) {
+					const targetTextarea = document.getElementById(textareaElementId);
+					if (targetTextarea.setRangeText) {
+						targetTextarea.setRangeText("\n[upload-" + file.name + "]\n", targetTextarea.selectionStart, targetTextarea.selectionEnd, "end");
+					}
 				done();
 			},
 			init: function() {
@@ -30,7 +34,8 @@ var DzFactory = function (max_imagesize) {
 					const targetTextarea = document.getElementById(textareaElementId);
 					if (targetTextarea.setRangeText) {
 						//if setRangeText function is supported by current browser
-						targetTextarea.setRangeText(serverResponse);
+						let u = "[upload-" + file.name + "]";
+						targetTextarea.setRangeText(serverResponse, targetTextarea.value.indexOf(u), targetTextarea.value.indexOf(u) + u.length, "end");
 					} else {
 						targetTextarea.focus();
 						document.execCommand('insertText', false /*no UI*/, serverResponse);
diff --git a/view/templates/item/compose.tpl b/view/templates/item/compose.tpl
index 4cccc924c3..4c7bdebfdb 100644
--- a/view/templates/item/compose.tpl
+++ b/view/templates/item/compose.tpl
@@ -92,6 +92,9 @@
 			<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
 
 			<div id="permissions-section" style="display: none;">
+			<script>
+				dzFactory.setupDropzone('#dropzone-{{$id}}', 'comment-edit-text-{{$id}}');
+			</script>
 {{if $type == 'post'}}
 			<h3>{{$l10n.visibility_title}}</h3>
 			{{$acl_selector nofilter}}
@@ -113,8 +116,6 @@
     </div>
 </div>
 <script>
-	dzFactory.setupDropzone('#dropzone-{{$id}}', 'comment-edit-text-{{$id}}');
-
 	document.addEventListener("DOMContentLoaded", function() {
 		var textareas = document.querySelectorAll(".expandable-textarea");