diff --git a/addons/sale_management/controllers/portal.py b/addons/sale_management/controllers/portal.py
index 187c203e916..11a8d7c4e35 100644
--- a/addons/sale_management/controllers/portal.py
+++ b/addons/sale_management/controllers/portal.py
@@ -43,8 +43,8 @@ class CustomerPortal(portal.CustomerPortal):
         if not order_line or order_line.order_id != order_sudo:
             return False
 
-        if not order_line.sale_order_option_ids:
-            # Do not allow updating non optional lines from a quotation
+        if not order_line._can_be_edited_on_portal():
+            # Do not allow updating non-optional products from a quotation
             return False
 
         if input_quantity is not False:
diff --git a/addons/sale_management/models/sale_order_line.py b/addons/sale_management/models/sale_order_line.py
index dd43b04c791..f7b29ba4f6a 100644
--- a/addons/sale_management/models/sale_order_line.py
+++ b/addons/sale_management/models/sale_order_line.py
@@ -35,3 +35,11 @@ class SaleOrderLine(models.Model):
         # used in the optional product line.
         optional_product_lines = self.filtered('sale_order_option_ids')
         super(SaleOrderLine, self - optional_product_lines)._compute_price_unit()
+
+    #=== TOOLING ===#
+
+    def _can_be_edited_on_portal(self):
+        return self.state in ('draft', 'sent') and (
+            self.sale_order_option_ids
+            or self.product_id in self.order_id.sale_order_option_ids.product_id
+        )
diff --git a/addons/sale_management/views/sale_portal_templates.xml b/addons/sale_management/views/sale_portal_templates.xml
index 10ecf5f72f6..6ed939e3361 100644
--- a/addons/sale_management/views/sale_portal_templates.xml
+++ b/addons/sale_management/views/sale_portal_templates.xml
@@ -4,7 +4,7 @@
     <template id="sale_order_portal_content_inherit_sale_management" name="Order Options" inherit_id="sale.sale_order_portal_content">
 
         <xpath expr="//section[@id='details']//t[@t-set='display_discount']" position="after">
-            <t t-set="display_remove" t-value="sale_order.state in ('draft', 'sent') and any(line.sale_order_option_ids for line in sale_order.order_line)"/>
+            <t t-set="display_remove" t-value="sale_order.state in ('draft', 'sent') and any(line._can_be_edited_on_portal() for line in sale_order.order_line)"/>
         </xpath>
 
         <xpath expr="//section[@id='details']//table[@id='sales_order_table']/thead/tr" position="inside">
@@ -15,7 +15,13 @@
 
         <xpath expr="//section[@id='details']//t[@t-if='not line.display_type']" position="inside">
             <td class="text-center" t-if="display_remove">
-                <a t-att-data-line-id="line.id" t-att-data-unlink="True" href="#" class="mb8 js_update_line_json d-print-none" t-if="sale_order.state in ('draft', 'sent') and line.sale_order_option_ids" aria-label="Remove" title="Remove">
+                <a t-if="line._can_be_edited_on_portal()"
+                   t-att-data-line-id="line.id"
+                   t-att-data-unlink="True"
+                   href="#"
+                   class="mb8 js_update_line_json d-print-none"
+                   aria-label="Remove"
+                   title="Remove">
                     <span class="fa fa-trash-o"></span>
                 </a>
             </td>
@@ -72,7 +78,7 @@
         </xpath>
 
         <xpath expr="//section[@id='details']//div[@id='quote_qty']" position="replace">
-            <t t-if="sale_order.state in ['draft', 'sent'] and line.sale_order_option_ids">
+            <t t-if="line._can_be_edited_on_portal()">
                 <div class="input-group js_quantity_container pull-right">
 
                     <span class="d-print-none input-group-text d-none d-md-inline-block">