diff --git a/Changelog.md b/Changelog.md
index 40e48a899..e5e89107f 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -12,6 +12,7 @@
 * Update comment in database example config [#7282](https://github.com/diaspora/diaspora/pull/7282)
 * Make the \#newhere post public again [#7311](https://github.com/diaspora/diaspora/pull/7311)
 * Remove whitespace from author link [#7330](https://github.com/diaspora/diaspora/pull/7330)
+* Fix autosize in modals [#7339](https://github.com/diaspora/diaspora/pull/7339)
 
 ## Features
 * Add support for [Liberapay](https://liberapay.com) donations [#7290](https://github.com/diaspora/diaspora/pull/7290)
diff --git a/app/assets/javascripts/app/helpers/modal_helper.js b/app/assets/javascripts/app/helpers/modal_helper.js
index 01aaac4b7..8e4db1efd 100644
--- a/app/assets/javascripts/app/helpers/modal_helper.js
+++ b/app/assets/javascripts/app/helpers/modal_helper.js
@@ -7,6 +7,7 @@
 
     modalBody.load(url, function(){
       $(id).find("#modalWaiter").remove();
+      autosize($("textarea", modalBody));
       $(id).trigger("modal:loaded");
     });
   };