diff --git a/src/components/dv/CallDetail.tsx b/src/components/dv/CallDetail.tsx
index babfbe5..60925c8 100644
--- a/src/components/dv/CallDetail.tsx
+++ b/src/components/dv/CallDetail.tsx
@@ -1,3 +1,4 @@
+import { useEffect } from 'react';
 import { orderBookingClient } from '../../api/clients';
 import { ORDER_BOOKING } from '../../api/config';
 import type { WiredDetailViewProps } from './OrderDetail';
@@ -6,9 +7,15 @@ import { Spinner } from '../reusable/Spinner';
 import { EmptyState } from '../reusable/EmptyState';
 import { CallCard } from '../cards/CallCard';
 
-export function CallDetail({ instanceId }: WiredDetailViewProps) {
+export function CallDetail({ instanceId, onDataLoad }: WiredDetailViewProps) {
   const { data, loading, error } = useDetailViewData(orderBookingClient, ORDER_BOOKING.detailViews.CALLS, instanceId);
 
+  useEffect(() => {
+    if (data && onDataLoad) {
+      onDataLoad(data);
+    }
+  }, [data, onDataLoad]);
+
   if (error) return <EmptyState title="Couldn't load record" hint={error} />;
   if (loading) return <div className="py-8 flex justify-center"><Spinner label="Loading Call Details..." /></div>;
   if (!data) return <EmptyState title="No details found" />;
diff --git a/src/components/dv/OrderDetail.tsx b/src/components/dv/OrderDetail.tsx
index c7fea06..b112efd 100644
--- a/src/components/dv/OrderDetail.tsx
+++ b/src/components/dv/OrderDetail.tsx
@@ -1,3 +1,4 @@
+import { useEffect } from 'react';
 import { orderBookingClient } from '../../api/clients';
 import { ORDER_BOOKING } from '../../api/config';
 import { useDetailViewData } from './useDetailViewData';
@@ -6,15 +7,22 @@ import { OrderCard } from '../cards/OrderCard';
 export interface WiredDetailViewProps {
   instanceId: string | number;
   columns?: 1 | 2 | 3;
+  onDataLoad?: (data: any) => void;
 }
 
-export function OrderDetail({ instanceId }: WiredDetailViewProps) {
+export function OrderDetail({ instanceId, onDataLoad }: WiredDetailViewProps) {
   const { data, config, loading, error } = useDetailViewData(
     orderBookingClient,
     ORDER_BOOKING.detailViews.ORDERS,
     instanceId
   );
 
+  useEffect(() => {
+    if (data && onDataLoad) {
+      onDataLoad(data);
+    }
+  }, [data, onDataLoad]);
+
   if (loading) return <div className="p-4 text-gray-500">Loading Order Details...</div>;
   if (error) return <div className="p-4 text-red-500">{error}</div>;
   if (!data) return <div className="p-4 text-gray-500">No data found.</div>;
diff --git a/src/screens/CallsPage.tsx b/src/screens/CallsPage.tsx
index 06f963b..337bac5 100644
--- a/src/screens/CallsPage.tsx
+++ b/src/screens/CallsPage.tsx
@@ -112,7 +112,7 @@ export function CallsPage() {
       >
         {instanceId != null && (
           <>
-            <CallDetail instanceId={instanceId} />
+            <CallDetail instanceId={instanceId} onDataLoad={setSelectedRow} />
             <div className="absolute bottom-6 right-6 flex flex-col items-end gap-3 z-50">
               {isFabOpen && (
                 <div className="flex flex-col gap-2 bg-white p-3 rounded-sm shadow-xl border border-border-subtle animate-in fade-in slide-in-from-bottom-2">
@@ -143,6 +143,8 @@ export function CallsPage() {
                           Place Order
                         </Button>
                       );
+                    } else if (stateName.includes('no order') || stateName.includes('non-productive') || stateName.includes('non productive')) {
+                      return null;
                     }
                     return (
                       <Button size="sm" onClick={(e) => { 
diff --git a/src/screens/OrdersPage.tsx b/src/screens/OrdersPage.tsx
index b64b1a4..7f60422 100644
--- a/src/screens/OrdersPage.tsx
+++ b/src/screens/OrdersPage.tsx
@@ -114,7 +114,7 @@ export function OrdersPage() {
       >
         {instanceId != null && (
           <>
-            <OrderDetail instanceId={instanceId} />
+            <OrderDetail instanceId={instanceId} onDataLoad={setSelectedRow} />
             <div className="absolute bottom-6 right-6 flex flex-col items-end gap-3 z-50">
               {isFabOpen && (
                 <div className="flex flex-col gap-2 bg-white p-3 rounded-sm shadow-xl border border-border-subtle animate-in fade-in slide-in-from-bottom-2">
@@ -145,6 +145,8 @@ export function OrdersPage() {
                           Place Order
                         </Button>
                       );
+                    } else if (stateName.includes('no order') || stateName.includes('non-productive') || stateName.includes('non productive')) {
+                      return null;
                     }
                     return (
                       <Button size="sm" onClick={(e) => {