diff --git a/Changelog.md b/Changelog.md
index a86d6e25120dcb675d7bdfe237be9feae612067c..70f1b294aaf0973a982e6a01231fb6edf8186af3 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -44,6 +44,7 @@
 * Fix reshare a post multiple times. [#3831](https://github.com/diaspora/diaspora/issues/3671)
 * Fix services index view. [#3884](https://github.com/diaspora/diaspora/issues/3884)
 * Excesive padding with "user-controls" in single post view. [#3861](https://github.com/diaspora/diaspora/issues/3861)
+* Resize full scaled image to a specific width. [#3818](https://github.com/diaspora/diaspora/issues/3818)
 
 ## Gem Updates
 
diff --git a/app/assets/stylesheets/lightbox.css.scss b/app/assets/stylesheets/lightbox.css.scss
index d84680a9320c9e1ee3b5f377e69e2292b54c16ec..fe629af9ccba8f3ca5cca56bb8bcc8ca178a39a1 100644
--- a/app/assets/stylesheets/lightbox.css.scss
+++ b/app/assets/stylesheets/lightbox.css.scss
@@ -28,8 +28,6 @@
     @include box-shadow(0, 10px, 20px, black);
     top: 0;
     display: block;
-    max-width: 800px;
-    max-height: 800px;
     margin-bottom: 120px;
   }
 
diff --git a/app/uploaders/processed_image.rb b/app/uploaders/processed_image.rb
index 88e889a0a8e93ba0d1f9b050dd78f27b7d44afd3..89750f336f5150d94c67de9b2c303e73cd43b6bb 100644
--- a/app/uploaders/processed_image.rb
+++ b/app/uploaders/processed_image.rb
@@ -30,7 +30,7 @@ class ProcessedImage < CarrierWave::Uploader::Base
     process :strip
   end
   version :scaled_full do
-    process :resize_to_limit => [700,700]
+    process :resize_to_limit => [700,nil]
     process :strip
   end