diff --git a/src/apps/dashboard/features/tasks/components/NewTriggerForm.tsx b/src/apps/dashboard/features/tasks/components/NewTriggerForm.tsx
index 7819335669..a5eef10723 100644
--- a/src/apps/dashboard/features/tasks/components/NewTriggerForm.tsx
+++ b/src/apps/dashboard/features/tasks/components/NewTriggerForm.tsx
@@ -23,13 +23,13 @@ type IProps = {
 
 const NewTriggerForm: FunctionComponent<IProps> = ({ open, title, onClose, onAdd }: IProps) => {
     const { dateFnsLocale } = useLocale();
-    const [triggerType, setTriggerType] = useState('DailyTrigger');
+    const [triggerType, setTriggerType] = useState<TaskTriggerInfoType>(TaskTriggerInfoType.DailyTrigger);
 
     const timeOfDayOptions = useMemo(() => getTimeOfDayOptions(dateFnsLocale), [dateFnsLocale]);
     const intervalOptions = useMemo(() => getIntervalOptions(dateFnsLocale), [dateFnsLocale]);
 
     const onTriggerTypeChange = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {
-        setTriggerType(e.target.value);
+        setTriggerType(e.target.value as TaskTriggerInfoType);
     }, []);
 
     const onSubmit = useCallback((e: React.FormEvent<HTMLFormElement>) => {
@@ -54,13 +54,13 @@ const NewTriggerForm: FunctionComponent<IProps> = ({ open, title, onClose, onAdd
         }
 
         if (data.TimeLimit.toString()) {
-            trigger.MaxRuntimeTicks = parseFloat(data.TimeLimit.toString()) * 3600000 * 1e4;
+            trigger.MaxRuntimeTicks = parseFloat(data.TimeLimit.toString()) * 36e9;
         }
 
         if (onAdd) {
             onAdd(trigger);
         }
-    }, [onAdd]);
+    }, [ onAdd ]);
 
     return (
         <Dialog
@@ -84,31 +84,31 @@ const NewTriggerForm: FunctionComponent<IProps> = ({ open, title, onClose, onAdd
                         onChange={onTriggerTypeChange}
                         label={globalize.translate('LabelTriggerType')}
                     >
-                        <MenuItem value='DailyTrigger'>{globalize.translate('OptionDaily')}</MenuItem>
-                        <MenuItem value='WeeklyTrigger'>{globalize.translate('OptionWeekly')}</MenuItem>
-                        <MenuItem value='IntervalTrigger'>{globalize.translate('OptionOnInterval')}</MenuItem>
-                        <MenuItem value='StartupTrigger'>{globalize.translate('OnApplicationStartup')}</MenuItem>
+                        <MenuItem value={TaskTriggerInfoType.DailyTrigger}>{globalize.translate('OptionDaily')}</MenuItem>
+                        <MenuItem value={TaskTriggerInfoType.WeeklyTrigger}>{globalize.translate('OptionWeekly')}</MenuItem>
+                        <MenuItem value={TaskTriggerInfoType.IntervalTrigger}>{globalize.translate('OptionOnInterval')}</MenuItem>
+                        <MenuItem value={TaskTriggerInfoType.StartupTrigger}>{globalize.translate('OnApplicationStartup')}</MenuItem>
                     </TextField>
 
-                    {triggerType == 'WeeklyTrigger' && (
+                    {triggerType == TaskTriggerInfoType.WeeklyTrigger && (
                         <TextField
                             name='DayOfWeek'
                             select
                             fullWidth
-                            defaultValue={'Sunday'}
+                            defaultValue={DayOfWeek.Sunday}
                             label={globalize.translate('LabelDay')}
                         >
-                            <MenuItem value='Sunday'>{globalize.translate('Sunday')}</MenuItem>
-                            <MenuItem value='Monday'>{globalize.translate('Monday')}</MenuItem>
-                            <MenuItem value='Tuesday'>{globalize.translate('Tuesday')}</MenuItem>
-                            <MenuItem value='Wednesday'>{globalize.translate('Wednesday')}</MenuItem>
-                            <MenuItem value='Thursday'>{globalize.translate('Thursday')}</MenuItem>
-                            <MenuItem value='Friday'>{globalize.translate('Friday')}</MenuItem>
-                            <MenuItem value='Saturday'>{globalize.translate('Saturday')}</MenuItem>
+                            <MenuItem value={DayOfWeek.Sunday}>{globalize.translate('Sunday')}</MenuItem>
+                            <MenuItem value={DayOfWeek.Monday}>{globalize.translate('Monday')}</MenuItem>
+                            <MenuItem value={DayOfWeek.Tuesday}>{globalize.translate('Tuesday')}</MenuItem>
+                            <MenuItem value={DayOfWeek.Wednesday}>{globalize.translate('Wednesday')}</MenuItem>
+                            <MenuItem value={DayOfWeek.Thursday}>{globalize.translate('Thursday')}</MenuItem>
+                            <MenuItem value={DayOfWeek.Friday}>{globalize.translate('Friday')}</MenuItem>
+                            <MenuItem value={DayOfWeek.Saturday}>{globalize.translate('Saturday')}</MenuItem>
                         </TextField>
                     )}
 
-                    {['DailyTrigger', 'WeeklyTrigger'].includes(triggerType) && (
+                    {(triggerType == TaskTriggerInfoType.DailyTrigger || triggerType == TaskTriggerInfoType.WeeklyTrigger) && (
                         <TextField
                             name='TimeOfDay'
                             select
@@ -125,7 +125,7 @@ const NewTriggerForm: FunctionComponent<IProps> = ({ open, title, onClose, onAdd
                         </TextField>
                     )}
 
-                    {triggerType == 'IntervalTrigger' && (
+                    {triggerType == TaskTriggerInfoType.IntervalTrigger && (
                         <TextField
                             name='Interval'
                             select
diff --git a/src/apps/dashboard/features/tasks/components/Task.tsx b/src/apps/dashboard/features/tasks/components/Task.tsx
index 0c5fda280b..eca9a665b5 100644
--- a/src/apps/dashboard/features/tasks/components/Task.tsx
+++ b/src/apps/dashboard/features/tasks/components/Task.tsx
@@ -2,11 +2,9 @@ import React, { FunctionComponent, useCallback } from 'react';
 import ListItem from '@mui/material/ListItem';
 import Avatar from '@mui/material/Avatar';
 import AccessTimeIcon from '@mui/icons-material/AccessTime';
-import ListItemButton from '@mui/material/ListItemButton';
 import ListItemAvatar from '@mui/material/ListItemAvatar';
 import ListItemText from '@mui/material/ListItemText';
 import Typography from '@mui/material/Typography';
-import Dashboard from 'utils/dashboard';
 import { TaskProps } from '../types/taskProps';
 import TaskProgress from './TaskProgress';
 import TaskLastRan from './TaskLastRan';
@@ -15,18 +13,12 @@ import PlayArrow from '@mui/icons-material/PlayArrow';
 import Stop from '@mui/icons-material/Stop';
 import { useStartTask } from '../api/useStartTask';
 import { useStopTask } from '../api/useStopTask';
+import ListItemLink from 'components/ListItemLink';
 
 const Task: FunctionComponent<TaskProps> = ({ task }: TaskProps) => {
     const startTask = useStartTask();
     const stopTask = useStopTask();
 
-    const navigateTaskEdit = useCallback(() => {
-        Dashboard.navigate(`/dashboard/tasks/edit?id=${task.Id}`)
-            .catch(err => {
-                console.error('[Task] failed to navigate to task edit page', err);
-            });
-    }, [task]);
-
     const handleStartTask = useCallback(() => {
         if (task.Id) {
             startTask.mutate({ taskId: task.Id });
@@ -48,7 +40,7 @@ const Task: FunctionComponent<TaskProps> = ({ task }: TaskProps) => {
                 </IconButton>
             }
         >
-            <ListItemButton onClick={navigateTaskEdit}>
+            <ListItemLink to={`/dashboard/tasks/edit?id=${task.Id}`}>
                 <ListItemAvatar>
                     <Avatar sx={{ bgcolor: 'primary.main' }}>
                         <AccessTimeIcon sx={{ color: '#fff' }} />
@@ -59,7 +51,7 @@ const Task: FunctionComponent<TaskProps> = ({ task }: TaskProps) => {
                     secondary={task.State == 'Running' ? <TaskProgress task={task} /> : <TaskLastRan task={task} />}
                     disableTypography
                 />
-            </ListItemButton>
+            </ListItemLink>
         </ListItem>
     );
 };