diff --git a/src/js/controller.js b/src/js/controller.js
index 40d67ad..fe791cf 100644
--- a/src/js/controller.js
+++ b/src/js/controller.js
@@ -12,14 +12,14 @@ angular.module('focaAbmChofer')
                 label: 'Transportista',
                 image: 'cliente.png'
             }];
-            $scope.focused = 1;
 
             //SETEO BOTONERA LATERAL
             $timeout(function() {
-                focaBotoneraLateralService.showSalir(true);
+                focaBotoneraLateralService.showSalir(false);
                 focaBotoneraLateralService.showPausar(false);
                 focaBotoneraLateralService.showCancelar(false);
                 focaBotoneraLateralService.showGuardar(false);
+                focaBotoneraLateralService.addCustomButton('Salir', salir);
             });
 
             if(focaAbmChoferService.transportistaSeleccionado.COD) {
@@ -79,13 +79,20 @@ angular.module('focaAbmChofer')
                     $scope.choferes = res.data;
                 });
             }
+
+            function salir() {
+                focaAbmChoferService.transportistaSeleccionado = {};
+                $location.path('/');
+            }
         }
     ])
     .controller('focaAbmChoferController', [
         '$scope', 'focaAbmChoferService', '$routeParams',
-        '$location', 'focaBotoneraLateralService', '$timeout',
+        '$location', 'focaBotoneraLateralService', '$timeout', 'focaModalService',
         function($scope, focaAbmChoferService, $routeParams,
-            $location, focaBotoneraLateralService, $timeout) {
+            $location, focaBotoneraLateralService, $timeout, focaModalService) {
+
+            $scope.focused = 1;
             $scope.nuevo = $routeParams.id === '0';
             $scope.chofer = {};
             $scope.transportistas = [];
@@ -135,12 +142,40 @@ angular.module('focaAbmChofer')
                 $location.path('/chofer');
             };
 
-            $scope.guardar = function() {
-                $scope.chofer.idTransportista = $routeParams.idTransportista;
-                delete $scope.chofer.transportista;
-                focaAbmChoferService.guardarChofer($scope.chofer).then(function() {
-                    $location.path('/chofer');
-                });
+            $scope.guardar = function(key) {
+                key = (typeof key  === 'undefined') ? 13 : key;
+
+                if(key === 13) {
+                    validaDni().then(function() {
+                        $scope.chofer.idTransportista = $routeParams.idTransportista;
+                        delete $scope.chofer.transportista;
+                        focaAbmChoferService.guardarChofer($scope.chofer).then(function() {
+                            $location.path('/chofer');
+                        });
+                    }, function() {
+                        focaModalService.alert('Dni existente');
+                    });
+                }
             };
+
+            function validaDni() {
+                return new Promise(function(resolve, reject) {
+                    focaAbmChoferService
+                        .getChoferPorTransportista(parseInt($routeParams.idTransportista))
+                        .then(function(res) {
+                            //Valida si existe dni
+                            var existe = res.data.filter(function(chofer) {
+                                return chofer.dni === $scope.chofer.dni &&
+                                    chofer.id !== $scope.chofer.id;
+                            });
+
+                            if(existe.length) {
+                                reject(existe);
+                            }else {
+                                resolve();
+                            }
+                        });
+                });
+            }
         }
     ]);
diff --git a/src/views/foca-abm-choferes-item.html b/src/views/foca-abm-choferes-item.html
index 89333c5..36a8114 100644
--- a/src/views/foca-abm-choferes-item.html
+++ b/src/views/foca-abm-choferes-item.html
@@ -9,18 +9,6 @@
     <form name="formChofer" class="col-md-12">
         <input type="hidden" name="id" ng-model="chofer.id" />
         <div class="form-group row">
-            <label class="offset-sm-1 col-sm-2 col-form-label">Transportista</label>
-            <div class="col-sm-4">
-                <input
-                    class="form-control"
-                    type="text"
-                    teclado-virtual
-                    ng-model="chofer.transportista.NOM"
-                    readonly
-                />
-            </div>
-        </div>
-        <div class="form-group row">
             <label class="offset-sm-1 col-sm-2 col-form-label">Nombre</label>
             <div class="col-sm-4">
                 <input
@@ -47,6 +35,7 @@
                     ng-keypress="next($event.keyCode)"
                     foca-focus="focused == 2"
                     ng-focus="focused = 2"
+                    ng-disabled="!nuevo"
                 />
             </div>
         </div>
@@ -59,7 +48,7 @@
                     teclado-virtual
                     ng-model="chofer.telefono"
                     ng-required="true"
-                    ng-keypress="next($event.keyCode)"
+                    ng-keypress="guardar($event.keyCode)"
                     foca-focus="focused == 3"
                     ng-focus="focused = 3"
                 />
diff --git a/src/views/foca-abm-choferes-listado.html b/src/views/foca-abm-choferes-listado.html
index 9a2e5b7..107d185 100644
--- a/src/views/foca-abm-choferes-listado.html
+++ b/src/views/foca-abm-choferes-listado.html
@@ -15,7 +15,6 @@
         <table class="table table-default table-hover table-sm table-abm table-striped mb-0">
             <thead>
                 <tr>
-                    <th>Código</th>
                     <th>Nombre</th>
                     <th>DNI</th>
                     <th>Teléfono</th>
@@ -32,7 +31,6 @@
             </thead>
             <tbody>
                 <tr ng-repeat="chofer in choferes | filter:filters">
-                    <td ng-bind="chofer.id"></td>
                     <td ng-bind="chofer.nombre"></td>
                     <td ng-bind="chofer.dni"></td>
                     <td ng-bind="chofer.telefono"></td>