diff --git a/app/assets/javascripts/posts.js b/app/assets/javascripts/posts.js
index b78984f8c..16000cc18 100644
--- a/app/assets/javascripts/posts.js
+++ b/app/assets/javascripts/posts.js
@@ -38,6 +38,11 @@
   }
 
   Danbooru.Post.initialize_gestures = function() {
+    var $body = $("body");
+    if ($body.data("hammer")) {
+      return;
+    }
+
     if (!window.matchMedia) {
       return;
     }
@@ -394,12 +399,14 @@
         $img.css("width", $img.data("original-width") * ratio);
         $img.css("height", $img.data("original-height") * ratio);
         Danbooru.Post.resize_ugoira_controls();
+        $("#image-container").css({overflow: "visible"});
       }
     } else {
       $img.data("scale-factor", 1);
       $img.width($img.data("original-width"));
       $img.height($img.data("original-height"));
       Danbooru.Post.resize_ugoira_controls();
+      $("#image-container").css({overflow: "scroll"});
     }
 
     Danbooru.Note.Box.scale_all();
diff --git a/app/assets/stylesheets/specific/z_responsive.scss b/app/assets/stylesheets/specific/z_responsive.scss
index 6ab7415da..5c04d9f9e 100644
--- a/app/assets/stylesheets/specific/z_responsive.scss
+++ b/app/assets/stylesheets/specific/z_responsive.scss
@@ -151,6 +151,10 @@
     margin-top: 5px;
   }
 
+  #image-container {
+    overflow: scroll;
+  }
+
   div#options {
     margin-top: 10px;
     font-size: 24pt;