diff --git a/src/lib/components/filters/content.svelte b/src/lib/components/filters/content.svelte
index 72634ab94f..b27ce32051 100644
--- a/src/lib/components/filters/content.svelte
+++ b/src/lib/components/filters/content.svelte
@@ -137,7 +137,12 @@
                             bind:value />
                     {:else if column.type === 'datetime'}
                         {#key value}
-                            <InputDateTime id="value" bind:value label="value" showLabel={false} />
+                            <InputDateTime
+                                id="value"
+                                bind:value
+                                label="value"
+                                showLabel={false}
+                                step={60} />
                         {/key}
                     {:else}
                         <InputText id="value" bind:value placeholder="Enter value" />
diff --git a/src/lib/elements/forms/inputDateTime.svelte b/src/lib/elements/forms/inputDateTime.svelte
index 5eb8da64d8..b63bd628f2 100644
--- a/src/lib/elements/forms/inputDateTime.svelte
+++ b/src/lib/elements/forms/inputDateTime.svelte
@@ -14,6 +14,7 @@
     export let readonly = false;
     export let autofocus = false;
     export let autocomplete = false;
+    export let step: number | 'any' = 0.001;
 
     let element: HTMLInputElement;
     let error: string;
@@ -70,7 +71,7 @@
             {readonly}
             {required}
             {value}
-            step=".001"
+            {step}
             autocomplete={autocomplete ? 'on' : 'off'}
             type="datetime-local"
             class="input-text"
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/executions/execute-function/+page.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/executions/execute-function/+page.svelte
index 0d8a9c5258..00a456f620 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/executions/execute-function/+page.svelte
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/executions/execute-function/+page.svelte
@@ -46,7 +46,7 @@
     } from '$lib/helpers/date';
     import { last } from '$lib/helpers/array';
 
-    let previousPage: string = base;
+    let previousPage: string = `${base}/project-${$page.params.project}/functions/function-${$page.params.function}/executions`;
 
     afterNavigate(({ from }) => {
         previousPage = from?.url?.pathname || previousPage;
@@ -126,10 +126,11 @@
     let now = new Date();
     let minDate: string;
     let date: string = toLocaleDateISO(now.getTime());
-    let time: string = toLocaleTimeISO(now.getTime());
-    $: minDate = toLocaleDateISO(now.getTime());
+    // We need to remove seconds from the min so the seconds are not displayed in the time picker
+    let time: string = toLocaleTimeISO(now.getTime()).split(':').slice(0, 2).join(':');
+    $: minDate = toLocaleDateISO(now.toString());
     $: minTime = isSameDay(new Date(date), new Date(minDate))
-        ? toLocaleTimeISO(now.getTime())
+        ? toLocaleTimeISO(now.getTime()).split(':').slice(0, 2).join(':')
         : '00:00';
     $: dateTime = new Date(`${date}T${time}`);
 
@@ -292,7 +293,6 @@
                                     required={true}
                                     min={minTime}
                                     bind:value={time}
-                                    step={1}
                                     isMultiple
                                     fullWidth />
                             </FormItem>