diff --git a/addons/pos_restaurant/models/pos_config.py b/addons/pos_restaurant/models/pos_config.py
index dfbeea42df5..c2c58a57ab1 100644
--- a/addons/pos_restaurant/models/pos_config.py
+++ b/addons/pos_restaurant/models/pos_config.py
@@ -69,7 +69,6 @@ class PosConfig(models.Model):
                 vals['iface_splitbill'] = True
             if not is_restaurant or not vals.get('iface_tipproduct', False):
                 vals['set_tip_after_payment'] = False
-            vals["iface_orderline_notes"] = is_restaurant
         pos_configs = super().create(vals_list)
         for config in pos_configs:
             if config.module_pos_restaurant:
diff --git a/addons/pos_restaurant/models/res_config_settings.py b/addons/pos_restaurant/models/res_config_settings.py
index 13948d0e0b6..ee105269d76 100644
--- a/addons/pos_restaurant/models/res_config_settings.py
+++ b/addons/pos_restaurant/models/res_config_settings.py
@@ -7,7 +7,7 @@ class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     pos_floor_ids = fields.Many2many(related='pos_config_id.floor_ids', readonly=False)
-    pos_iface_orderline_notes = fields.Boolean(compute='_compute_pos_module_pos_restaurant', store=True, readonly=False)
+    pos_iface_orderline_notes = fields.Boolean(related='pos_config_id.iface_orderline_notes', readonly=False)
     pos_iface_printbill = fields.Boolean(compute='_compute_pos_module_pos_restaurant', store=True, readonly=False)
     pos_iface_splitbill = fields.Boolean(compute='_compute_pos_module_pos_restaurant', store=True, readonly=False)
     pos_set_tip_after_payment = fields.Boolean(compute='_compute_pos_set_tip_after_payment', store=True, readonly=False)
@@ -18,13 +18,11 @@ class ResConfigSettings(models.TransientModel):
         for res_config in self:
             if not res_config.pos_module_pos_restaurant:
                 res_config.update({
-                    'pos_iface_orderline_notes': False,
                     'pos_iface_printbill': False,
                     'pos_iface_splitbill': False,
                 })
             else:
                 res_config.update({
-                    'pos_iface_orderline_notes': res_config.pos_config_id.iface_orderline_notes,
                     'pos_iface_printbill': res_config.pos_config_id.iface_printbill,
                     'pos_iface_splitbill': res_config.pos_config_id.iface_splitbill,
                 })
diff --git a/addons/pos_restaurant/static/src/app/control_buttons/orderline_note_button/orderline_note_button.xml b/addons/pos_restaurant/static/src/app/control_buttons/orderline_note_button/orderline_note_button.xml
index 86470bc5d08..72a834d7c36 100644
--- a/addons/pos_restaurant/static/src/app/control_buttons/orderline_note_button/orderline_note_button.xml
+++ b/addons/pos_restaurant/static/src/app/control_buttons/orderline_note_button/orderline_note_button.xml
@@ -2,7 +2,7 @@
 <templates id="template" xml:space="preserve">
 
     <t t-name="pos_restaurant.OrderlineNoteButton">
-        <button class="control-button btn btn-light rounded-0 fw-bolder" t-on-click="() => this.click()">
+        <button class="control-button btn btn-light rounded-0 fw-bolder" t-on-click="() => this.click()" t-att-disabled="!selectedOrderline">
             <i class="fa fa-tag me-1" />
             <span> </span>
             <span>Internal Note</span>
diff --git a/addons/pos_restaurant/views/res_config_settings_views.xml b/addons/pos_restaurant/views/res_config_settings_views.xml
index 3580ecf82b0..101d0c5a576 100644
--- a/addons/pos_restaurant/views/res_config_settings_views.xml
+++ b/addons/pos_restaurant/views/res_config_settings_views.xml
@@ -18,9 +18,6 @@
                         </div>
                     </div>
                 </setting>
-                <setting string="Internal Notes" help="Add internal notes on order lines for the kitchen" id="iface_orderline_notes"  invisible="not pos_module_pos_restaurant">
-                    <field name="pos_iface_orderline_notes"/>
-                </setting>
                 <setting string="Early Receipt Printing" help="Allow to print receipt before payment" id="iface_printbill"  invisible="not pos_module_pos_restaurant or is_kiosk_mode">
                     <field name="pos_iface_printbill"/>
                 </setting>
@@ -42,6 +39,11 @@
                     <label class="fw-normal" for="pos_set_tip_after_payment" string="Add tip after payment"/>
                 </div>
             </div>
+            <block id="pos_interface_section" position="inside">
+                <setting string="Internal Notes" help="Add internal notes on order lines for the kitchen" id="iface_orderline_notes">
+                    <field name="pos_iface_orderline_notes"/>
+                </setting>
+            </block>
         </field>
     </record>
 </odoo>