diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 8c489c2bd..c7321fcd0 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -4024,6 +4024,27 @@
                                             <folder_node>
                                                 <name>timetickets</name>
                                                 <children>
+                                                    <concept_node>
+                                                        <name>edit</name>
+                                                        <definition_loaded>false</definition_loaded>
+                                                        <description></description>
+                                                        <comment></comment>
+                                                        <default_text></default_text>
+                                                        <translations>
+                                                            <translation>
+                                                                <language>en-US</language>
+                                                                <approved>false</approved>
+                                                            </translation>
+                                                            <translation>
+                                                                <language>es-MX</language>
+                                                                <approved>false</approved>
+                                                            </translation>
+                                                            <translation>
+                                                                <language>fr-CA</language>
+                                                                <approved>false</approved>
+                                                            </translation>
+                                                        </translations>
+                                                    </concept_node>
                                                     <concept_node>
                                                         <name>enter</name>
                                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/shop-info/shop-info.rbac.component.jsx b/client/src/components/shop-info/shop-info.rbac.component.jsx
index c2e49462b..3cc24227a 100644
--- a/client/src/components/shop-info/shop-info.rbac.component.jsx
+++ b/client/src/components/shop-info/shop-info.rbac.component.jsx
@@ -405,6 +405,18 @@ export default function ShopInfoRbacComponent({ form }) {
         >
           <InputNumber />
         </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.rbac.timetickets.edit")}
+          rules={[
+            {
+              required: true,
+              message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_rbac", "timetickets:edit"]}
+        >
+          <InputNumber />
+        </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.rbac.shop.vendors")}
           rules={[
diff --git a/client/src/components/time-ticket-list/time-ticket-list.component.jsx b/client/src/components/time-ticket-list/time-ticket-list.component.jsx
index 44fc59545..749d7d8b4 100644
--- a/client/src/components/time-ticket-list/time-ticket-list.component.jsx
+++ b/client/src/components/time-ticket-list/time-ticket-list.component.jsx
@@ -1,13 +1,13 @@
 import { Table } from "antd";
+import moment from "moment";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
-import { alphaSort } from "../../utils/sorters";
-import { DateFormatter } from "../../utils/DateFormatter";
-import TimeTicketEnterButton from "../time-ticket-enter-button/time-ticket-enter-button.component";
-import { DateTimeFormatter } from "../../utils/DateFormatter";
-import moment from "moment";
 import { onlyUnique } from "../../utils/arrayHelper";
+import { DateFormatter, DateTimeFormatter } from "../../utils/DateFormatter";
+import { alphaSort } from "../../utils/sorters";
+import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
+import TimeTicketEnterButton from "../time-ticket-enter-button/time-ticket-enter-button.component";
 
 export default function TimeTicketList({
   disabled,
@@ -128,12 +128,14 @@ export default function TimeTicketList({
         }
       },
     },
-    !!techConsole
-      ? {
-          title: t("general.labels.actions"),
-          dataIndex: "actions",
-          key: "actions",
-          render: (text, record) => (
+
+    ({
+      title: t("general.labels.actions"),
+      dataIndex: "actions",
+      key: "actions",
+      render: (text, record) => (
+        <div>
+          {!!techConsole && (
             <TimeTicketEnterButton
               actions={{ refetch }}
               context={{ id: record.id, timeticket: record }}
@@ -141,9 +143,29 @@ export default function TimeTicketList({
             >
               {t("general.actions.edit")}
             </TimeTicketEnterButton>
-          ),
-        }
-      : null,
+          )}
+          {!techConsole && (
+            <RbacWrapper
+              action="timetickets:edit"
+              noauth={() => {
+                return <div />;
+              }}
+            >
+              <TimeTicketEnterButton
+                actions={{ refetch }}
+                context={{
+                  id: record.id,
+                  timeticket: record,
+                }}
+                disabled={!!!record.jobid || disabled}
+              >
+                {t("general.actions.edit")}
+              </TimeTicketEnterButton>
+            </RbacWrapper>
+          )}
+        </div>
+      ),
+    }: null),
   ];
 
   const handleTableChange = (pagination, filters, sorter) => {
diff --git a/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx b/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx
index 06e66fb3e..b2f27d121 100644
--- a/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx
+++ b/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx
@@ -181,6 +181,7 @@ export function TimeTicketModalContainer({
                 jobid:
                   (timeTicketModal.context.timeticket.job &&
                     timeTicketModal.context.timeticket.job.id) ||
+                  timeTicketModal.context.timeticket.jobid ||
                   null,
                 date: timeTicketModal.context.timeticket.date
                   ? moment(timeTicketModal.context.date)
diff --git a/client/src/graphql/timetickets.queries.js b/client/src/graphql/timetickets.queries.js
index 0d2474712..d4758dbcd 100644
--- a/client/src/graphql/timetickets.queries.js
+++ b/client/src/graphql/timetickets.queries.js
@@ -36,6 +36,7 @@ export const QUERY_TIME_TICKETS_IN_RANGE = gql`
       rate
       productivehrs
       memo
+      jobid
       job {
         id
         ro_number
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 7d20d4030..cbcf23424 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -277,6 +277,7 @@
 						"vendors": "Shop -> Vendors"
 					},
 					"timetickets": {
+						"edit": "Time Tickets -> Edit",
 						"enter": "Time Tickets -> Enter",
 						"list": "Time Tickets -> List"
 					}
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 84b973399..8acef73f0 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -277,6 +277,7 @@
 						"vendors": ""
 					},
 					"timetickets": {
+						"edit": "",
 						"enter": "",
 						"list": ""
 					}
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 19548c7d7..3b0284a07 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -277,6 +277,7 @@
 						"vendors": ""
 					},
 					"timetickets": {
+						"edit": "",
 						"enter": "",
 						"list": ""
 					}