diff --git a/src/App.tsx b/src/App.tsx
index 213d272de..6d77afa1c 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -85,9 +85,9 @@ function App() {
 				<StyledEngineProvider injectFirst />,
 				<ThemeProvider theme={theme} />,
 				<SnackbarProvider maxSnack={3} />,
+				<DialogProvider />,
 				<KeycloakAuth />,
 				<Store />,
-				<DialogProvider />,
 				<Auth />,
 				<ShSimulation />,
 				<PythonConverterService />,
diff --git a/src/ThreeEditor/components/Dialog/ClearHistoryDialog.tsx b/src/ThreeEditor/components/Dialog/ClearHistoryDialog.tsx
index 6603bafb5..158a6fcf8 100644
--- a/src/ThreeEditor/components/Dialog/ClearHistoryDialog.tsx
+++ b/src/ThreeEditor/components/Dialog/ClearHistoryDialog.tsx
@@ -1,11 +1,12 @@
 import { Button } from '@mui/material';
 
-import { useStore } from '../../../services/StoreService';
+import { StoreContext } from '../../../services/StoreService';
 import { ConcreteDialogProps, CustomDialog } from './CustomDialog';
 
-export function ClearHistoryDialog({ onClose }: ConcreteDialogProps) {
-	const { yaptideEditor } = useStore();
-
+export function ClearHistoryDialog({
+	onClose,
+	yaptideEditor
+}: ConcreteDialogProps<Pick<StoreContext, 'yaptideEditor'>>) {
 	return (
 		<CustomDialog
 			onClose={onClose}
diff --git a/src/ThreeEditor/components/Dialog/EditProjectInfoDialog.tsx b/src/ThreeEditor/components/Dialog/EditProjectInfoDialog.tsx
index d4c13e4cd..dcbd7039d 100644
--- a/src/ThreeEditor/components/Dialog/EditProjectInfoDialog.tsx
+++ b/src/ThreeEditor/components/Dialog/EditProjectInfoDialog.tsx
@@ -1,11 +1,13 @@
 import { Box, Button, TextField } from '@mui/material';
 import { useState } from 'react';
 
-import { useStore } from '../../../services/StoreService';
+import { StoreContext } from '../../../services/StoreService';
 import { ConcreteDialogProps, CustomDialog } from './CustomDialog';
 
-export function EditProjectInfoDialog({ onClose }: ConcreteDialogProps) {
-	const { yaptideEditor } = useStore();
+export function EditProjectInfoDialog({
+	onClose,
+	yaptideEditor
+}: ConcreteDialogProps<Pick<StoreContext, 'yaptideEditor'>>) {
 	const [title, setTitle] = useState<string>(yaptideEditor?.config.getKey('project/title'));
 	const [description, setDescription] = useState<string>(
 		yaptideEditor?.config.getKey('project/description')
diff --git a/src/ThreeEditor/components/Dialog/LoadFileDialog.tsx b/src/ThreeEditor/components/Dialog/LoadFileDialog.tsx
index 4c8ae48d0..6186692d2 100644
--- a/src/ThreeEditor/components/Dialog/LoadFileDialog.tsx
+++ b/src/ThreeEditor/components/Dialog/LoadFileDialog.tsx
@@ -1,20 +1,21 @@
 import { Button } from '@mui/material';
 import Typography from '@mui/material/Typography';
 
-import { useStore } from '../../../services/StoreService';
+import { StoreContext } from '../../../services/StoreService';
 import { EditorJson } from '../../js/EditorJson';
 import { ConcreteDialogProps, CustomDialog } from './CustomDialog';
 
 export function LoadFileDialog({
 	onClose,
 	validVersion = true,
-	data
-}: ConcreteDialogProps<{
-	validVersion: boolean;
-	data: EditorJson;
-}>) {
-	const { yaptideEditor } = useStore();
-
+	data,
+	yaptideEditor
+}: ConcreteDialogProps<
+	{
+		validVersion: boolean;
+		data: EditorJson;
+	} & Pick<StoreContext, 'yaptideEditor'>
+>) {
 	return (
 		<CustomDialog
 			alert={true}
diff --git a/src/ThreeEditor/components/Dialog/NewProjectDialog.tsx b/src/ThreeEditor/components/Dialog/NewProjectDialog.tsx
index 7e72da3c8..d8457281e 100644
--- a/src/ThreeEditor/components/Dialog/NewProjectDialog.tsx
+++ b/src/ThreeEditor/components/Dialog/NewProjectDialog.tsx
@@ -1,11 +1,12 @@
 import { Button } from '@mui/material';
 
-import { useStore } from '../../../services/StoreService';
+import { StoreContext, useStore } from '../../../services/StoreService';
 import { ConcreteDialogProps, CustomDialog } from './CustomDialog';
 
-export function NewProjectDialog({ onClose }: ConcreteDialogProps) {
-	const { yaptideEditor } = useStore();
-
+export function NewProjectDialog({
+	onClose,
+	yaptideEditor
+}: ConcreteDialogProps<Pick<StoreContext, 'yaptideEditor'>>) {
 	return (
 		<CustomDialog
 			onClose={onClose}
diff --git a/src/ThreeEditor/components/Dialog/RejectKeycloakUserDialog.tsx b/src/ThreeEditor/components/Dialog/RejectKeycloakUserDialog.tsx
index 162b39e1a..a0512bddd 100644
--- a/src/ThreeEditor/components/Dialog/RejectKeycloakUserDialog.tsx
+++ b/src/ThreeEditor/components/Dialog/RejectKeycloakUserDialog.tsx
@@ -1,14 +1,16 @@
 import { Button } from '@mui/material';
 
-import { useKeycloakAuth } from '../../../services/KeycloakAuthService';
+import { KeycloakAuthContext } from '../../../services/KeycloakAuthService';
 import { ConcreteDialogProps, CustomDialog } from './CustomDialog';
 
 export function RejectKeycloakUserDialog({
 	onClose,
-	reason
-}: ConcreteDialogProps & { reason: string }) {
-	const { keycloak, initialized } = useKeycloakAuth();
-
+	reason,
+	keycloakAuth: { keycloak, initialized }
+}: ConcreteDialogProps<{
+	reason: string;
+	keycloakAuth: KeycloakAuthContext;
+}>) {
 	return (
 		<CustomDialog
 			onClose={onClose}
@@ -16,14 +18,15 @@ export function RejectKeycloakUserDialog({
 			title='Keycloak User Rejected'
 			contentText={
 				initialized
-					? `Hello ${keycloak.tokenParsed?.preferred_username}. We could not accept your authorisation because of the following:\n${reason}\nPlease contact with an administrator to resolve this issue.`
+					? `Hello ${keycloak!.tokenParsed
+							?.preferred_username}. We could not accept your authorisation because of the following:\n${reason}\nPlease contact with an administrator to resolve this issue.`
 					: 'Connection could not be established with the authentication server. Please try again later.'
 			}>
 			<Button
 				onClick={() => {
 					onClose();
 
-					if (initialized && keycloak.authenticated) keycloak.logout();
+					if (initialized && keycloak!.authenticated) keycloak!.logout();
 				}}
 				autoFocus>
 				I understand
diff --git a/src/ThreeEditor/components/Dialog/RunSimulationDialog.tsx b/src/ThreeEditor/components/Dialog/RunSimulationDialog.tsx
index 6ecb84c16..bc63f4113 100644
--- a/src/ThreeEditor/components/Dialog/RunSimulationDialog.tsx
+++ b/src/ThreeEditor/components/Dialog/RunSimulationDialog.tsx
@@ -2,8 +2,8 @@ import { Card, CardContent, Fade, Modal } from '@mui/material';
 import { enqueueSnackbar } from 'notistack';
 import { useState } from 'react';
 
-import { useShSimulation } from '../../../services/ShSimulatorService';
-import { useStore } from '../../../services/StoreService';
+import { RestSimulationContext } from '../../../services/ShSimulatorService';
+import { StoreContext } from '../../../services/StoreService';
 import { SimulatorType } from '../../../types/RequestTypes';
 import { SimulationInputFiles } from '../../../types/ResponseTypes';
 import {
@@ -19,15 +19,19 @@ export function RunSimulationDialog({
 	inputFiles = {},
 	simulator,
 	onClose,
-	onSubmit = () => {}
-}: ConcreteDialogProps<{
-	onSubmit?: (jobId: string) => void;
-	inputFiles?: Record<string, string>;
-	simulator: SimulatorType;
-}>) {
-	const { yaptideEditor } = useStore();
+	onSubmit = () => {},
+	yaptideEditor,
+	postJobDirect,
+	postJobBatch
+}: ConcreteDialogProps<
+	{
+		onSubmit?: (jobId: string) => void;
+		inputFiles?: Record<string, string>;
+		simulator: SimulatorType;
+	} & Pick<StoreContext, 'yaptideEditor'> &
+		Pick<RestSimulationContext, 'postJobDirect' | 'postJobBatch'>
+>) {
 	const [controller] = useState(new AbortController());
-	const { postJobDirect, postJobBatch } = useShSimulation();
 	const sendSimulationRequest = (
 		postJobFn: typeof postJobDirect,
 		runType: SimulationRunType,
@@ -46,16 +50,22 @@ export function RunSimulationDialog({
 			runType === 'batch'
 				? {
 						...batchOptions,
-						arrayOptions: batchOptions.arrayOptions?.reduce((acc, curr) => {
-							acc[curr.optionKey] = curr.optionValue;
+						arrayOptions: batchOptions.arrayOptions?.reduce(
+							(acc, curr) => {
+								acc[curr.optionKey] = curr.optionValue;
 
-							return acc;
-						}, {} as Record<string, string>),
-						collectOptions: batchOptions.collectOptions?.reduce((acc, curr) => {
-							acc[curr.optionKey] = curr.optionValue;
+								return acc;
+							},
+							{} as Record<string, string>
+						),
+						collectOptions: batchOptions.collectOptions?.reduce(
+							(acc, curr) => {
+								acc[curr.optionKey] = curr.optionValue;
 
-							return acc;
-						}, {} as Record<string, string>)
+								return acc;
+							},
+							{} as Record<string, string>
+						)
 				  }
 				: undefined;
 
diff --git a/src/ThreeEditor/components/Dialog/SaveFileDialog.tsx b/src/ThreeEditor/components/Dialog/SaveFileDialog.tsx
index ebd6413dd..238213281 100644
--- a/src/ThreeEditor/components/Dialog/SaveFileDialog.tsx
+++ b/src/ThreeEditor/components/Dialog/SaveFileDialog.tsx
@@ -2,7 +2,7 @@ import { Button, Checkbox, FormControlLabel, TextField } from '@mui/material';
 import { ChangeEvent, useCallback, useEffect, useState } from 'react';
 
 import { FullSimulationData } from '../../../services/ShSimulatorService';
-import { useStore } from '../../../services/StoreService';
+import { StoreContext } from '../../../services/StoreService';
 import { saveString } from '../../../util/File';
 import { ConcreteDialogProps, CustomDialog } from './CustomDialog';
 
@@ -25,13 +25,15 @@ export function SaveFileDialog({
 	onClose,
 	name: defaultName = 'editor',
 	results: providedResults,
-	disableCheckbox = false
-}: ConcreteDialogProps<{
-	name?: string;
-	results?: FullSimulationData;
-	disableCheckbox?: boolean;
-}>) {
-	const { yaptideEditor } = useStore();
+	disableCheckbox = false,
+	yaptideEditor
+}: ConcreteDialogProps<
+	{
+		name?: string;
+		results?: FullSimulationData;
+		disableCheckbox?: boolean;
+	} & Pick<StoreContext, 'yaptideEditor'>
+>) {
 	const results: FullSimulationData | undefined = providedResults ?? yaptideEditor?.getResults();
 
 	const [keepResults, setKeepResults] = useState<boolean>(false);
diff --git a/src/WrapperApp/components/InputEditor/InputFilesEditor.tsx b/src/WrapperApp/components/InputEditor/InputFilesEditor.tsx
index e2ef43e65..c7717a62c 100644
--- a/src/WrapperApp/components/InputEditor/InputFilesEditor.tsx
+++ b/src/WrapperApp/components/InputEditor/InputFilesEditor.tsx
@@ -5,6 +5,7 @@ import CodeEditor from '@uiw/react-textarea-code-editor';
 import { useConfig } from '../../../config/ConfigService';
 import { useAuth } from '../../../services/AuthService';
 import { useDialog } from '../../../services/DialogService';
+import { useShSimulation } from '../../../services/ShSimulatorService';
 import { useStore } from '../../../services/StoreService';
 import { SimulatorType } from '../../../types/RequestTypes';
 import {
@@ -27,6 +28,7 @@ interface InputFilesEditorProps {
 
 export function InputFilesEditor(props: InputFilesEditorProps) {
 	const [open] = useDialog('runSimulation');
+	const { postJobDirect, postJobBatch } = useShSimulation();
 	const { setTrackedId } = useStore();
 	const { demoMode } = useConfig();
 	const { isAuthorized } = useAuth();
@@ -90,7 +92,9 @@ export function InputFilesEditor(props: InputFilesEditorProps) {
 								Object.entries(inputFiles).filter(([, data]) => data.length > 0)
 							),
 							simulator: props.simulator,
-							onSubmit: setTrackedId
+							onSubmit: setTrackedId,
+							postJobDirect,
+							postJobBatch
 						})
 					}>
 					Run with these input files
diff --git a/src/WrapperApp/components/Simulation/SimulationCardGrid.tsx b/src/WrapperApp/components/Simulation/SimulationCardGrid.tsx
index b2206b93d..4d5a20709 100644
--- a/src/WrapperApp/components/Simulation/SimulationCardGrid.tsx
+++ b/src/WrapperApp/components/Simulation/SimulationCardGrid.tsx
@@ -14,6 +14,7 @@ import {
 import { FC, useState } from 'react';
 
 import { useDialog } from '../../../services/DialogService';
+import { useShSimulation } from '../../../services/ShSimulatorService';
 import { useStore } from '../../../services/StoreService';
 import { SimulatorType } from '../../../types/RequestTypes';
 import { JobStatusData, SimulationInputFiles } from '../../../types/ResponseTypes';
@@ -211,6 +212,8 @@ export function PaginatedSimulationsFromBackend({
 }: SimulationsFromBackendProps) {
 	const { setTrackedId } = useStore();
 	const [open] = useDialog('runSimulation');
+	const { yaptideEditor } = useStore();
+	const { postJobDirect, postJobBatch } = useShSimulation();
 
 	return (
 		<PaginatedSimulationCardGrid {...other}>
@@ -226,7 +229,10 @@ export function PaginatedSimulationsFromBackend({
 					onClick={() =>
 						open({
 							onSubmit: setTrackedId,
-							simulator: SimulatorType.SHIELDHIT
+							simulator: SimulatorType.SHIELDHIT,
+							yaptideEditor,
+							postJobDirect,
+							postJobBatch
 						})
 					}>
 					Run new simulation
diff --git a/src/services/AuthService.tsx b/src/services/AuthService.tsx
index c74e75da0..0f41daeb0 100644
--- a/src/services/AuthService.tsx
+++ b/src/services/AuthService.tsx
@@ -187,7 +187,8 @@ const Auth = ({ children }: GenericContextProviderProps) => {
 
 		if (!validUser)
 			open({
-				reason: 'You are not authorized to use this application.'
+				reason: 'You are not authorized to use this application.',
+				keycloakAuth: { keycloak, initialized }
 			});
 		else if (initialized)
 			return kyRef
@@ -212,7 +213,8 @@ const Auth = ({ children }: GenericContextProviderProps) => {
 						reason:
 							err.response?.status === 403
 								? 'You are not authorized to use this application.'
-								: err.message
+								: err.message,
+						keycloakAuth: { keycloak, initialized }
 					});
 				});
 	}, [initialized, keycloak, kyRef, open]);