diff --git a/public/modules/forms/directives/submit-form.client.directive.js b/public/modules/forms/directives/submit-form.client.directive.js
index 08af66fb..adec834f 100644
--- a/public/modules/forms/directives/submit-form.client.directive.js
+++ b/public/modules/forms/directives/submit-form.client.directive.js
@@ -29,7 +29,7 @@ angular.module('forms').directive('submitFormDirective', ['$http', '$timeout', '
                     };
 
                     $scope.nextField = function(){
-                        if($scope.selected.index < $scope.myform.form_fields.length){
+                        if($scope.selected.index < $scope.myform.form_fields.length-1){
                             $scope.selected.index++;
                             $scope.selected._id = $scope.myform.form_fields[$scope.selected.index]._id;
                         }
diff --git a/public/modules/forms/views/directiveViews/form/submit-form.client.view.html b/public/modules/forms/views/directiveViews/form/submit-form.client.view.html
index a00993d6..27f86e2f 100755
--- a/public/modules/forms/views/directiveViews/form/submit-form.client.view.html
+++ b/public/modules/forms/views/directiveViews/form/submit-form.client.view.html
@@ -67,10 +67,10 @@
                         <a href="/#!/forms/{{myform._id}}/admin/create" class="btn btn-default">Edit this NodeForm</a>
                     </div>
                     <div class="col-md-1 col-md-offset-2" style="padding-left:5px" class="hidden-sm hidden-xs">
-                        <div class="btn btn-info" id="focusDownButton" ng-click="nextField()">\/</div>
+                        <button class="btn btn-info" id="focusDownButton" ng-click="nextField()" ng-disabled="selected.index == myform.form_fields.length-1">\/</button>
                     </div>
                     <div class="col-md-1" class="hidden-sm hidden-xs">
-                        <div class="btn btn-info" id="focusUpButton" ng-click="prevField()">/\</div>
+                        <button class="btn btn-info" id="focusUpButton" ng-click="prevField()" ng-disabled="selected.index == 0">/\</button>
                     </div>
                 </div>
             </div>