diff --git a/static/src/app/components/opening_control_popup/opening_control_popup.xml b/static/src/app/components/opening_control_popup/opening_control_popup.xml
new file mode 100644
index 0000000..058d774
--- /dev/null
+++ b/static/src/app/components/opening_control_popup/opening_control_popup.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates id="template" xml:space="preserve">
+    <!-- Restrict Open Register button in OpeningControlPopup to exclude Waiter role -->
+    <t t-name="pos_employee_role.OpeningControlPopup" t-inherit="point_of_sale.OpeningControlPopup" t-inherit-mode="extension">
+        <xpath expr="//button[hasclass('btn-primary')]" position="attributes">
+            <attribute name="t-if">!(this.pos.cashier._role === 'minimal') and this.pos.cashier.pos_role != 'waiter'</attribute>
+        </xpath>
+    </t>
+</templates>
diff --git a/static/src/app/screens/product_screen/action_pad/action_pad.xml b/static/src/app/screens/product_screen/action_pad/action_pad.xml
index fad4509..ce1631e 100644
--- a/static/src/app/screens/product_screen/action_pad/action_pad.xml
+++ b/static/src/app/screens/product_screen/action_pad/action_pad.xml
@@ -6,7 +6,7 @@
             <attribute name="t-if">this.pos.cashier.pos_role != 'waiter'</attribute>
         </xpath>
         <xpath expr="//button[hasclass('pay-order-button')]" position="after">
-            <button t-if="this.pos.cashier.pos_role == 'waiter' and this.pos.config.basic_receipt" 
+            <button t-if="(this.pos.cashier.pos_role == 'waiter' or this.pos.cashier.pos_role == 'cashier') and this.pos.config.basic_receipt" 
                     class="button btn btn-secondary btn-lg py-3 d-flex align-items-center justify-content-center flex-fill"
                     t-att-class="{'col-3': showFastPaymentMethods}" 
                     t-on-click="() => this.pos.printReceipt({ order: this.currentOrder, basic: true })">