diff --git a/public_html/js/Presenters/PostContentPresenter.js b/public_html/js/Presenters/PostContentPresenter.js
index 698037be..a74b6dab 100644
--- a/public_html/js/Presenters/PostContentPresenter.js
+++ b/public_html/js/Presenters/PostContentPresenter.js
@@ -38,6 +38,25 @@ App.Presenters.PostContentPresenter = function(
         var containerWidth = $wrapper.parent().outerWidth() - 10;
 
         return {
+            'fit-both': function(allowUpscale) {
+                var width = containerWidth;
+                var height = containerWidth / ratio;
+                if (height > containerHeight) {
+                    width = containerHeight * ratio;
+                    height = containerHeight;
+                }
+                if (!allowUpscale) {
+                    if (width > originalWidth) {
+                        width = originalWidth;
+                        height = originalWidth / ratio;
+                    }
+                    if (height > originalHeight) {
+                        width = originalHeight * ratio;
+                        height = originalHeight;
+                    }
+                }
+                $wrapper.css({maxWidth: width + 'px', width: ''});
+            },
             'fit-height': function(allowUpscale) {
                 var width = containerHeight * ratio;
                 if (width > originalWidth && !allowUpscale) {
diff --git a/public_html/templates/browsing-settings.tpl b/public_html/templates/browsing-settings.tpl
index 7747b71d..b4b29633 100644
--- a/public_html/templates/browsing-settings.tpl
+++ b/public_html/templates/browsing-settings.tpl
@@ -56,13 +56,19 @@
         <div class="form-input">
             <input <% print(settings.fitMode === 'fit-width' ? 'checked="checked"' : '') %> type="radio" id="browsing-settings-fit-width" name="fitMode" value="fit-width"/>
             <label for="browsing-settings-fit-width">
-                Fit width
+                Fit to width
             </label>
             <br/>
 
             <input <% print(settings.fitMode === 'fit-height' ? 'checked="checked"' : '') %> type="radio" id="browsing-settings-fit-height" name="fitMode" value="fit-height"/>
             <label for="browsing-settings-fit-height">
-                Fit height
+                Fit to height
+            </label>
+            <br/>
+
+            <input <% print(settings.fitMode === 'fit-both' ? 'checked="checked"' : '') %> type="radio" id="browsing-settings-fit-both" name="fitMode" value="fit-both"/>
+            <label for="browsing-settings-fit-both">
+                Fit width and height
             </label>
             <br/>
 
diff --git a/public_html/templates/post.tpl b/public_html/templates/post.tpl
index 545d15e8..5e233c17 100644
--- a/public_html/templates/post.tpl
+++ b/public_html/templates/post.tpl
@@ -272,6 +272,7 @@ if (forceHttpInPermalinks > 0) {
                     Fit:
                     <a data-fit-mode="fit-width" href="#">width</a>,
                     <a data-fit-mode="fit-height" href="#">height</a>,
+                    <a data-fit-mode="fit-both" href="#">both</a>,
                     <a data-fit-mode="original" href="#">original</a>
                 </li>
             </ul>