diff --git a/js/angular/service/history.js b/js/angular/service/history.js
index 592fbcc7fd..066d143148 100644
--- a/js/angular/service/history.js
+++ b/js/angular/service/history.js
@@ -691,7 +691,7 @@ function($rootScope, $state, $location, $window, $timeout, $ionicViewSwitcher, $
 function($rootScope, $state, $location, $document, $ionicPlatform, $ionicHistory) {
 
   // always reset the keyboard state when change stage
-  $rootScope.$on('$stateChangeStart', function() {
+  $rootScope.$on('$ionicView.beforeEnter', function() {
     ionic.keyboard && ionic.keyboard.hide && ionic.keyboard.hide();
   });
 
diff --git a/js/views/scrollView.js b/js/views/scrollView.js
index c6b07e50f6..a3ad6b14ad 100644
--- a/js/views/scrollView.js
+++ b/js/views/scrollView.js
@@ -629,7 +629,7 @@ ionic.views.Scroll = ionic.views.View.inherit({
       if ( !self.isScrolledIntoView ) {
         // shrink scrollview so we can actually scroll if the input is hidden
         // if it isn't shrink so we can scroll to inputs under the keyboard
-        if ((ionic.Platform.isIOS() || ionic.Platform.isFullScreen) && !container.parentNode.classList.contains('modal')){
+        if ((ionic.Platform.isIOS() || ionic.Platform.isFullScreen)){
 
           // if there are things below the scroll view account for them and
           // subtract them from the keyboard height when resizing