diff --git a/templates/files.html b/templates/files.html
index 0a58f99..bfcf079 100644
--- a/templates/files.html
+++ b/templates/files.html
@@ -57,7 +57,11 @@
                 <div class="col flex-grow-1 my-auto d-flex justify-content-center w-100">
                     <button id="prev" name="prev" class="prev sm-txt btn btn-outline-secondary"><i class="fas fa-arrow-alt-circle-left"></i></button>
                     <span class="sm-txt my-auto">&nbsp;{{how_many}} files&nbsp;</span>
-                    <button id="next" name="next" class="next sm-txt btn btn-outline-secondary"><i class="fas fa-arrow-alt-circle-right"></i></button>
+                    {% set nxt_disabled="" %}
+                    {% if entry_data|length < how_many|int %}
+                        {% set nxt_disabled="disabled" %}
+                    {% endif %}
+                    <button id="next" {{nxt_disabled}} name="next" class="next sm-txt btn btn-outline-secondary"><i class="fas fa-arrow-alt-circle-right"></i></button>
                     <button id="move" disabled name="move" class="sm-txt btn btn-outline-primary ms-4" onClick="MoveDBox(); return false;"><i class="fas fa-folder-plus"></i></button>
                     {% if "files_rbp" in request.url %}
                         <button id="del" disabled name="del" class="sm-txt btn btn-outline-success mx-1" onClick="DelDBox('Restore'); return false;">
@@ -230,7 +234,7 @@
                     <div class="col my-auto d-flex justify-content-center">
                         <button onClick="$.each( $('#main_form').serializeArray() , function( index, value ) { $('#nav_form').append( '<input type=hidden name=' + value['name'] +' value='+value['value'] + '>' ); })" id="prev" name="prev" class="prev sm-txt btn btn-outline-secondary"><i class="fas fa-arrow-alt-circle-left"></i></button>
                         <span class="sm-txt my-auto">&nbsp;{{how_many}} files&nbsp;</span>
-                        <button onClick="$.each( $('#main_form').serializeArray() , function( index, value ) { $('#nav_form').append( '<input type=hidden name=' + value['name'] +' value='+value['value'] + '>' ); });" id="next" name="next" class="next sm-txt btn btn-outline-secondary"><i class="fas fa-arrow-alt-circle-right"></i></button>
+                        <button onClick="$.each( $('#main_form').serializeArray() , function( index, value ) { $('#nav_form').append( '<input type=hidden name=' + value['name'] +' value='+value['value'] + '>' ); });" id="next" {{nxt_disabled}} name="next" class="next sm-txt btn btn-outline-secondary"><i class="fas fa-arrow-alt-circle-right"></i></button>
                     </div>
                 </div>
             </form>