diff --git a/system/lang/en-en.json b/system/lang/en-en.json
index 3ac4cc2..38cd292 100644
--- a/system/lang/en-en.json
+++ b/system/lang/en-en.json
@@ -302,6 +302,7 @@
             "title": "Twenty questions",
             "bt_abrev": "20Q",
             "bt_refresh": "Refresh",
+            "bt_next": "Next",
             "increase_ring1": "Ring increase (1)",
             "increase_ring2": "Ring increase (2)",
             "increase_skill1": "Skill increases (1)",
diff --git a/system/lang/es-es.json b/system/lang/es-es.json
index 905a625..a23098f 100644
--- a/system/lang/es-es.json
+++ b/system/lang/es-es.json
@@ -302,6 +302,7 @@
             "title": "Twenty questions",
             "bt_abrev": "20Q",
             "bt_refresh": "Refresh",
+            "bt_next": "Next",
             "increase_ring1": "Ring increase (1)",
             "increase_ring2": "Ring increase (2)",
             "increase_skill1": "Skill increases (1)",
diff --git a/system/lang/fr-fr.json b/system/lang/fr-fr.json
index a066b28..5db24ba 100644
--- a/system/lang/fr-fr.json
+++ b/system/lang/fr-fr.json
@@ -302,6 +302,7 @@
             "title": "Le jeu des Vingt questions",
             "bt_abrev": "20Q",
             "bt_refresh": "Actualiser",
+            "bt_next": "Suivant",
             "increase_ring1": "Augmentation d'anneau (1)",
             "increase_ring2": "Augmentations d'anneau (2)",
             "increase_skill1": "Augmentation de compétence (1)",
diff --git a/system/scripts/actors/twenty-questions-dialog.js b/system/scripts/actors/twenty-questions-dialog.js
index d5d53a6..8f7e31d 100644
--- a/system/scripts/actors/twenty-questions-dialog.js
+++ b/system/scripts/actors/twenty-questions-dialog.js
@@ -152,6 +152,15 @@ export class TwentyQuestionsDialog extends FormApplication {
             tgt.hasClass("toggle-active") ? tgt.removeClass("toggle-active") : tgt.addClass("toggle-active");
         });
 
+        // BT Next
+        html.find(".next").on("click", (event) => {
+            event.preventDefault();
+            event.stopPropagation();
+            const tab = this._tabs.find((e) => e._navSelector === ".sheet-tabs");
+            const next = parseInt(tab.active.replace(/[^0-9]/g, "")) + 1;
+            tab.activate("part" + next);
+        });
+
         // *** Everything below here is only needed if the sheet is editable ***
         if (!this.options.editable) {
             return;
diff --git a/system/scripts/dice/dice-picker-dialog.js b/system/scripts/dice/dice-picker-dialog.js
index b9bad94..7d4a49a 100644
--- a/system/scripts/dice/dice-picker-dialog.js
+++ b/system/scripts/dice/dice-picker-dialog.js
@@ -241,6 +241,7 @@ export class DicePickerDialog extends FormApplication {
             actorIsPc: !this._actor || this._actor.data?.type === "character",
             canUseVoidPoint:
                 this.object.difficulty.hidden || !this._actor || this._actor.data.data.void_points.value > 0,
+            disableSubmit: this.object.skill.value < 1 && this.object.ring.value < 1,
         };
     }
 
diff --git a/system/templates/actors/twenty-questions-dialog.html b/system/templates/actors/twenty-questions-dialog.html
index 69c2de1..df2cf46 100644
--- a/system/templates/actors/twenty-questions-dialog.html
+++ b/system/templates/actors/twenty-questions-dialog.html
@@ -18,8 +18,10 @@
             <article class="tab parts part0" data-group="primary" data-tab="part0">
                 <h1>{{localize 'l5r5e.twenty_questions.title'}}</h1>
                 {{localize 'l5r5e.twenty_questions.part0.intro'}}
-                <br /><br />
-                <i> {{localize 'l5r5e.twenty_questions.part0.section'}}</i>
+                <br />
+                <br /><i> {{localize 'l5r5e.twenty_questions.part0.section'}}</i>
+                <br />
+                <br /><button class="next" name="next" type="button">{{localize 'l5r5e.twenty_questions.bt_next'}} <i class='fas fa-arrow-right'></i></button>
             </article>
             <article class="tab parts part1" data-group="primary" data-tab="part1">
                 <h2>{{localize 'l5r5e.twenty_questions.part1.title'}}</h2>
@@ -126,6 +128,8 @@
                         </td>
                     </tr>
                 </table>
+                <br />
+                <br /><button class="next" name="next" type="button">{{localize 'l5r5e.twenty_questions.bt_next'}} <i class='fas fa-arrow-right'></i></button>
             </article>
             <article class="tab parts part2" data-group="primary" data-tab="part2">
                 <h2>{{localize 'l5r5e.twenty_questions.part2.title'}}</h2>
@@ -272,6 +276,8 @@
                         {{/select}}
                     </select>
                 </label>
+                <br />
+                <br /><button class="next" name="next" type="button">{{localize 'l5r5e.twenty_questions.bt_next'}} <i class='fas fa-arrow-right'></i></button>
             </article>
             <article class="tab parts part3" data-group="primary" data-tab="part3">
                 <h2>{{localize 'l5r5e.twenty_questions.part3.title'}}</h2>
@@ -367,6 +373,8 @@
                         </tr>
                     </table>
                 </div>
+                <br />
+                <br /><button class="next" name="next" type="button">{{localize 'l5r5e.twenty_questions.bt_next'}} <i class='fas fa-arrow-right'></i></button>
             </article>
             <article class="tab parts part4" data-group="primary" data-tab="part4">
                 <h2>{{localize 'l5r5e.twenty_questions.part4.title'}}</h2>
@@ -444,6 +452,8 @@
                     {{localize 'l5r5e.twenty_questions.part4.disadvantage'}}
                     {{> 'systems/l5r5e/templates/actors/character/twenty-questions-item.html' itemsList=cache.step13.disadvantage stepName='step13.disadvantage' itemType='peculiarities' hideDndAt=1 }}
                 </div>
+                <br />
+                <br /><button class="next" name="next" type="button">{{localize 'l5r5e.twenty_questions.bt_next'}} <i class='fas fa-arrow-right'></i></button>
             </article>
             <article class="tab parts part5" data-group="primary" data-tab="part5">
                 <h2>{{localize 'l5r5e.twenty_questions.part5.title'}}</h2>
@@ -475,6 +485,8 @@
                         {{> 'systems/l5r5e/templates/actors/character/twenty-questions-item.html' itemsList=cache.step16.item stepName='step16.item' itemType='items' hideDndAt=1 }}
                     </label>
                 </div>
+                <br />
+                <br /><button class="next" name="next" type="button">{{localize 'l5r5e.twenty_questions.bt_next'}} <i class='fas fa-arrow-right'></i></button>
             </article>
             <article class="tab parts part6" data-group="primary" data-tab="part6">
                 <h2>{{localize 'l5r5e.twenty_questions.part6.title'}}</h2>
@@ -582,6 +594,8 @@
                         <textarea name="step19.firstname">{{data.step19.firstname}}</textarea>
                     </label>
                 </div>
+                <br />
+                <br /><button class="next" name="next" type="button">{{localize 'l5r5e.twenty_questions.bt_next'}} <i class='fas fa-arrow-right'></i></button>
             </article>
             <article class="tab parts part7" data-group="primary" data-tab="part7">
                 <h2>{{localize 'l5r5e.twenty_questions.part7.title'}}</h2>
diff --git a/system/templates/dice/dice-picker-dialog.html b/system/templates/dice/dice-picker-dialog.html
index 97e064d..ee897e3 100644
--- a/system/templates/dice/dice-picker-dialog.html
+++ b/system/templates/dice/dice-picker-dialog.html
@@ -163,6 +163,6 @@
     </table>
 
     <div class="form-group">
-        <button name="roll" type="submit">{{localize 'l5r5e.dicepicker.roll_label'}} <i class='fas fa-arrow-circle-right'></i></button>
+        <button name="roll" type="submit" {{#if disableSubmit}}disabled{{/if}}>{{localize 'l5r5e.dicepicker.roll_label'}} <i class='fas fa-arrow-circle-right'></i></button>
     </div>
 </form>