diff --git a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
index 219dc6cc5..2e06b48a4 100644
--- a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
+++ b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
@@ -28,6 +28,8 @@ const mapDispatchToProps = (dispatch) => ({
     dispatch(setModalContext({ context: context, modal: "payment" })),
   setJobCostingContext: (context) =>
     dispatch(setModalContext({ context: context, modal: "jobCosting" })),
+  setTimeTicketContext: (context) =>
+    dispatch(setModalContext({ context: context, modal: "timeTicket" })),
 });
 
 export function JobsDetailHeaderActions({
@@ -39,6 +41,7 @@ export function JobsDetailHeaderActions({
   setPaymentContext,
   setJobCostingContext,
   jobRO,
+  setTimeTicketContext,
 }) {
   const { t } = useTranslation();
   const client = useApolloClient();
@@ -110,6 +113,19 @@ export function JobsDetailHeaderActions({
           {t("jobs.actions.viewchecklist")}
         </Link>
       </Menu.Item>
+      <Menu.Item
+        key="entertimetickets"
+        onClick={() => {
+          logImEXEvent("job_header_enter_time_ticekts");
+
+          setTimeTicketContext({
+            actions: {},
+            context: { jobId: job.id },
+          });
+        }}
+      >
+        {t("timetickets.actions.enter")}
+      </Menu.Item>
       <Menu.Item
         key="enterpayments"
         disabled={jobRO}
diff --git a/client/src/components/jobs-detail-labor/jobs-detail-labor.component.jsx b/client/src/components/jobs-detail-labor/jobs-detail-labor.component.jsx
index 63df16e6c..98f3078c2 100644
--- a/client/src/components/jobs-detail-labor/jobs-detail-labor.component.jsx
+++ b/client/src/components/jobs-detail-labor/jobs-detail-labor.component.jsx
@@ -27,11 +27,7 @@ export function JobsDetailLaborContainer({
   return (
     <div>
       {techConsole ? null : (
-        <TimeTicketEnterButton
-          disabled={jobRO}
-          actions={{ refetch }}
-          context={{ jobId: jobId }}
-        >
+        <TimeTicketEnterButton actions={{ refetch }} context={{ jobId: jobId }}>
           {t("timetickets.actions.enter")}
         </TimeTicketEnterButton>
       )}
diff --git a/client/src/components/jobs-find-modal/jobs-find-modal.component.jsx b/client/src/components/jobs-find-modal/jobs-find-modal.component.jsx
index c770590f1..ce3106117 100644
--- a/client/src/components/jobs-find-modal/jobs-find-modal.component.jsx
+++ b/client/src/components/jobs-find-modal/jobs-find-modal.component.jsx
@@ -86,17 +86,13 @@ export default function JobsFindModalComponent({
       key: "vehicle",
       width: "15%",
       ellipsis: true,
-      render: (text, record) => {
-        return record.vehicle ? (
-          <Link to={"/manage/vehicles/" + record.vehicleid}>
-            {`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
-              record.v_model_desc || ""
-            }`}
-          </Link>
-        ) : (
-          t("jobs.errors.novehicle")
-        );
-      },
+      render: (text, record) => (
+        <Link to={"/manage/vehicles/" + record.vehicleid}>
+          {`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
+            record.v_model_desc || ""
+          }`}
+        </Link>
+      ),
     },
     {
       title: t("vehicles.fields.plate_no"),
diff --git a/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx b/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
index 8be13a059..cb5859a54 100644
--- a/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
+++ b/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
@@ -13,10 +13,8 @@ import TimeTicketList from "../time-ticket-list/time-ticket-list.component";
 
 export default function TimeTicketModalComponent({
   form,
-  roAutoCompleteOptions,
+
   employeeAutoCompleteOptions,
-  loadLineTicketData,
-  lineTicketData,
 }) {
   const { t } = useTranslation();
 
@@ -33,7 +31,7 @@ export default function TimeTicketModalComponent({
             },
           ]}
         >
-          <JobSearchSelect options={roAutoCompleteOptions} />
+          <JobSearchSelect convertedOnly notExported={false} />
         </Form.Item>
         <Form.Item
           label={t("timetickets.fields.date")}
diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js
index 68bb29992..5c429a431 100644
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -828,7 +828,6 @@ export const SEARCH_JOBS_FOR_AUTOCOMPLETE = gql`
     search_jobs(
       args: { search: $search }
       limit: 50
-      order_by: { ro_number: desc_nulls_last }
       where: {
         _and: {
           converted: { _eq: $isConverted }