diff --git a/src/vitis/client/javascript/externs/formReader/component/file_picker/file_picker.js b/src/vitis/client/javascript/externs/formReader/component/file_picker/file_picker.js
index 189063d715a1c722d965c9fd2a6791c93426b4dc..2c1224b8aeef3587f60ed9fdd11d0314e39cf75b 100644
--- a/src/vitis/client/javascript/externs/formReader/component/file_picker/file_picker.js
+++ b/src/vitis/client/javascript/externs/formReader/component/file_picker/file_picker.js
@@ -453,6 +453,13 @@ nsVitisComponent.FilePickerDirective = function ($timeout, $translate, propertie
             scope['showImageModal'] = function(oImage) {
                 $log.log("formReader.FilePickerDirective.showImageModal");
 
+                var iImageIndex;
+                for (var i = 0; i < scope['aPreviewImages'].length; i++) {
+                    if(scope['aPreviewImages'][i]['name'] === oImage['name']){
+                        iImageIndex = angular.copy(i);
+                    }
+                }
+
                 var domModalcontent = $('<div class="modal-image-zone"></div>');
                 var domImage = $('<img src="' + oImage['src'] + '">');
 
@@ -486,10 +493,23 @@ nsVitisComponent.FilePickerDirective = function ($timeout, $translate, propertie
                     scope['showNextImageModal'](oImage, dialog, true);
                 });
 
+                // Image
                 $(domModalcontent).append(domImage);
-                $(domImageToolsContainer).append(domImageToolsPrev);
-                $(domImageToolsContainer).append(domImageToolsNext);
+
+                // Boutons suivant/précédent
+                if (goog.isDefAndNotNull(iImageIndex)) {
+                    if (iImageIndex > 0) {
+                        $(domImageToolsContainer).append(domImageToolsPrev);
+                    }
+                    if (iImageIndex < scope['aPreviewImages'].length - 1) {
+                        $(domImageToolsContainer).append(domImageToolsNext);
+                    }
+                }
+
+                // Bouton téléchargement
                 $(domDownloadButtonContainer).append(domDownloadButton);
+
+                // Containers
                 $(domModalcontent).append(domDownloadButtonContainer);
                 $(domModalcontent).append(domImageToolsContainer);