diff --git a/Duplicati/Server/webroot/index.html b/Duplicati/Server/webroot/index.html
index c52980a2e..8a3032845 100644
--- a/Duplicati/Server/webroot/index.html
+++ b/Duplicati/Server/webroot/index.html
@@ -171,15 +171,15 @@
     </div>
 
     <div id="edit-dialog" class="modal-dialog tabs edit-dialog" title="Edit backup">
-        <form id="edit-dialog-form">
-            <ul>
-                <li><a href="#edit-tab-general">General</a></li>
-                <li><a href="#edit-tab-sourcedata">Source Data</a></li>
-                <li><a href="#edit-tab-target">Target</a></li>
-                <li><a href="#edit-tab-schedule">Schedule</a></li>
-                <li><a href="#edit-tab-options">Options</a></li>
-            </ul>
+        <ul>
+            <li><a href="#edit-tab-general">General</a></li>
+            <li><a href="#edit-tab-sourcedata">Source Data</a></li>
+            <li><a href="#edit-tab-target">Target</a></li>
+            <li><a href="#edit-tab-schedule">Schedule</a></li>
+            <li><a href="#edit-tab-options">Options</a></li>
+        </ul>
 
+        <form id="edit-dialog-form">
             <div id="edit-tab-general">
                 <div class="edit-dialog-label">Name of backup</div>
                 <input type="text" name="backup-name" id="backup-name" class="ui-corner-all" />
diff --git a/Duplicati/Server/webroot/scripts/app.js b/Duplicati/Server/webroot/scripts/app.js
index eb3ef881a..cfefb0649 100644
--- a/Duplicati/Server/webroot/scripts/app.js
+++ b/Duplicati/Server/webroot/scripts/app.js
@@ -345,7 +345,7 @@ $(document).ready(function() {
             }},
             { text: 'Next', click: function(event, ui) {
                 var cur = parseInt($('#edit-dialog').tabs( "option", "active"));
-                var max = $('#edit-dialog').tabs("length");
+                var max = $('#edit-dialog').parent().find('[role=tablist] > li').size() - 1;
                 event.curPage = cur;
                 event.currentTarget.curPage = cur;
                 cur = Math.min(cur+1, max);
diff --git a/Duplicati/Server/webroot/scripts/editdialog.js b/Duplicati/Server/webroot/scripts/editdialog.js
index f643e34fd..76cc2729d 100644
--- a/Duplicati/Server/webroot/scripts/editdialog.js
+++ b/Duplicati/Server/webroot/scripts/editdialog.js
@@ -277,7 +277,8 @@ $(document).ready(function() {
     });
 
     $(dlg_buttons[1]).click(function(event, ui) {
-        if (event.curPage == 4) {
+        var tabs = $('#edit-dialog').parent().find('[role=tablist] > li');
+        if (event.curPage == tabs.size() - 1) {
             // Saving, validate first 
 
             if ($('#backup-name').val().trim() == '') {