diff --git a/src/js/controller.js b/src/js/controller.js
index 5d5e7fe..18dfd19 100644
--- a/src/js/controller.js
+++ b/src/js/controller.js
@@ -25,6 +25,9 @@ angular.module('focaModalCheque')
                 if(sugerido && sugerido < 0) {
                     $scope.cheque.importe = Math.abs(sugerido);
                 }
+                $scope.next = function(key) {
+                    if(key === 13) $scope.focused++;
+                };
 
                 $scope.seleccionarBanco = function(key) {
                     if(key === 13) {
diff --git a/src/views/modal-cheque.html b/src/views/modal-cheque.html
index fef4b1b..8e2258a 100644
--- a/src/views/modal-cheque.html
+++ b/src/views/modal-cheque.html
@@ -91,7 +91,7 @@
                     placeholder="Librador"
                     ng-model="cheque.librador"
                     ng-required="true"
-                    ng-keypress="focused = 5"
+                    ng-keypress="next($event.keyCode)"
                     foca-focus="focused == 4"
                     ng-focus="focused = 4"/>
             </div>
@@ -106,7 +106,7 @@
                     placeholder="Número"
                     ng-model="cheque.numero"
                     ng-required="true"
-                    ng-keypress="focused = 6"
+                    ng-keypress="next($event.keyCode)"
                     foca-focus="focused == 5"
                     ng-focus="focused = 5"/>
             </div>
@@ -120,7 +120,7 @@
                     class="form-control form-control-sm"
                     placeholder="Importe"
                     ng-model="cheque.importe"
-                    ng-keypress="focused = 7; datepickerOpen = true"
+                    ng-keypress="next($event.keyCode)"
                     ng-required="true"
                     foca-focus="focused == 6"
                     ng-focus="focused = 6"/>