diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 3b9ad7a11..e7037c671 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -17,9 +17,6 @@ a {
   a:hover {
     color: #018790; }
 
-#show_photo img {
-  width: 100%; }
-
 #flash_notice,
 #flash_error,
 #flash_alert {
@@ -233,6 +230,9 @@ li.comment > img.person_picture {
     .request_buttons > li:first-child {
       margin-right: 1em; }
 
+#show_photo img {
+  max-width: 100%; }
+
 #debug_info {
   margin-top: 20px; }
 
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index bc2cc58e2..1d9d85fa2 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -274,7 +274,7 @@ li.comment > img.person_picture
 
 #show_photo
   img
-    :width 100%
+    :max-width 100%