diff --git a/addons/point_of_sale/static/src/app/navbar/navbar.xml b/addons/point_of_sale/static/src/app/navbar/navbar.xml
index 07d2fdccd61..c3f8199bcea 100644
--- a/addons/point_of_sale/static/src/app/navbar/navbar.xml
+++ b/addons/point_of_sale/static/src/app/navbar/navbar.xml
@@ -27,7 +27,7 @@
                                 <li class="ticket-button" t-on-click="onTicketButtonClick">
                                     <a class="dropdown-item with-badge py-2">
                                         Orders
-                                        <span class="badge text-bg-info rounded-pill py-1 ms-2" t-esc="orderCount"/>
+                                        <span t-if="orderCount>0" class="badge text-bg-info rounded-pill py-1 ms-2" t-esc="orderCount"/>
                                     </a>
                                 </li>
                                 <li t-if="showCashMoveButton" class="menu-item navbar-button" t-on-click="onCashMoveButtonClick">
diff --git a/addons/pos_restaurant/static/src/overrides/components/navbar/navbar.js b/addons/pos_restaurant/static/src/overrides/components/navbar/navbar.js
index 15c02502463..d69ff3674be 100644
--- a/addons/pos_restaurant/static/src/overrides/components/navbar/navbar.js
+++ b/addons/pos_restaurant/static/src/overrides/components/navbar/navbar.js
@@ -15,7 +15,7 @@ patch(Navbar.prototype, {
         return super.orderCount;
     },
     _shouldLoadOrders() {
-        return super._shouldLoadOrders() || (this.pos.config.module_pos_restaurant && !this.pos.table);
+        return super._shouldLoadOrders() || this.pos.config.module_pos_restaurant;
     },
     onSwitchButtonClick() {
         const mode = this.pos.floorPlanStyle == "kanban" ? "default" : "kanban";
diff --git a/addons/pos_restaurant/static/src/overrides/components/ticket_screen/ticket_screen.js b/addons/pos_restaurant/static/src/overrides/components/ticket_screen/ticket_screen.js
index 18f0d39c4c6..73906630fc5 100644
--- a/addons/pos_restaurant/static/src/overrides/components/ticket_screen/ticket_screen.js
+++ b/addons/pos_restaurant/static/src/overrides/components/ticket_screen/ticket_screen.js
@@ -57,12 +57,6 @@ patch(TicketScreen.prototype, {
             ? Boolean(this.pos.table)
             : super.allowNewOrders;
     },
-    _getOrderList() {
-        if (this.pos.table) {
-            return this.pos.getTableOrders(this.pos.table.id);
-        }
-        return super._getOrderList(...arguments);
-    },
     async settleTips() {
         // set tip in each order
         for (const order of this.getFilteredOrderList()) {
diff --git a/addons/pos_restaurant/static/src/overrides/models/pos_store.js b/addons/pos_restaurant/static/src/overrides/models/pos_store.js
index c4fb88ccf0d..fc3c48201e0 100644
--- a/addons/pos_restaurant/static/src/overrides/models/pos_store.js
+++ b/addons/pos_restaurant/static/src/overrides/models/pos_store.js
@@ -229,6 +229,15 @@ patch(PosStore.prototype, {
         }
         return super._createOrder(...arguments);
     },
+    getDefaultSearchDetails() {
+        if (this.table && this.table.id) {
+            return {
+                fieldName: "TABLE",
+                searchTerm: this.table.name,
+            };
+        }
+        return super.getDefaultSearchDetails();
+    },
     loadRestaurantFloor() {
         // we do this in the front end due to the circular/recursive reference needed
         // Ignore floorplan features if no floor specified.