diff --git a/dist/js/ionic.js b/dist/js/ionic.js
index c9a0cca61d..29affd66a2 100644
--- a/dist/js/ionic.js
+++ b/dist/js/ionic.js
@@ -2066,7 +2066,7 @@ window.ionic = {
 
         // Whether to disable overflow rubber banding when content is small
         // enough to fit in the viewport (i.e. doesn't need scrolling)
-        disableNonOverflowRubberBand: false,
+        disableNonOverflowRubberBand: true,
 
         // Called as the refresher is opened, an amount is passed
         onRefreshOpening: function() {},
@@ -2524,7 +2524,9 @@ window.ionic = {
         startTime: Date.now()
       };
 
-      if(this.disableNonOverflowRubberBand === true) {
+      // If the viewport is too small and we aren't using pull to refresh,
+      // don't rubber band the drag
+      if(this.disableNonOverflowRubberBand === true && !this._refresher) {
         var maxX = Math.min(0, (-totalWidth + parentWidth));
         var maxY = Math.min(0, (-totalHeight + parentHeight));
 
diff --git a/js/ext/angular/test/list.html b/js/ext/angular/test/list.html
index 915f46cf13..a7797386c6 100644
--- a/js/ext/angular/test/list.html
+++ b/js/ext/angular/test/list.html
@@ -119,7 +119,7 @@
         };
 
         $scope.items = [];
-        for(var i = 0; i < 20; i++) {
+        for(var i = 0; i < 5; i++) {
           $scope.items.push({
             text: 'Item ' + i,
             canDelete: true,
diff --git a/js/views/scrollView.js b/js/views/scrollView.js
index b758d93b4e..4fc3925026 100644
--- a/js/views/scrollView.js
+++ b/js/views/scrollView.js
@@ -50,7 +50,7 @@
 
         // Whether to disable overflow rubber banding when content is small
         // enough to fit in the viewport (i.e. doesn't need scrolling)
-        disableNonOverflowRubberBand: false,
+        disableNonOverflowRubberBand: true,
 
         // Called as the refresher is opened, an amount is passed
         onRefreshOpening: function() {},
@@ -508,7 +508,9 @@
         startTime: Date.now()
       };
 
-      if(this.disableNonOverflowRubberBand === true) {
+      // If the viewport is too small and we aren't using pull to refresh,
+      // don't rubber band the drag
+      if(this.disableNonOverflowRubberBand === true && !this._refresher) {
         var maxX = Math.min(0, (-totalWidth + parentWidth));
         var maxY = Math.min(0, (-totalHeight + parentHeight));