diff --git a/src/components/shared/wizard/RenderField.tsx b/src/components/shared/wizard/RenderField.tsx
index 05c1f2b439..d02545f4e2 100644
--- a/src/components/shared/wizard/RenderField.tsx
+++ b/src/components/shared/wizard/RenderField.tsx
@@ -33,9 +33,9 @@ const RenderField = ({
 	const handleKeyDown = (event, type) => {
 		const { key } = event;
 		// keys pressable for leaving edit mode
-		const keys = ["Escape", "Enter"];
+		const keys = ["Escape", "Tab", "Enter"];
 
-		if ((type !== "textarea" || type !== "select") && keys.indexOf(key) > -1) {
+		if (type !== "textarea" && keys.indexOf(key) > -1) {
 			setEditMode(false);
 		}
 	};
@@ -209,7 +209,7 @@ const EditableDateValue = ({
 			/>
 		</div>
 	) : (
-		<div onFocus={() => setEditMode(true)} className="show-edit" tabIndex={0}>
+		<div onClick={() => setEditMode(true)} className="show-edit">
 			<span className="editable preserve-newlines">
 				<RenderDate date={text} />
 			</span>
@@ -263,13 +263,13 @@ const EditableSingleSelect = ({
 // @ts-expect-error TS(7006): Parameter 'element' implicitly has an 'any' type.
 				handleChange={(element) => setFieldValue(field.name, element.value)}
 				placeholder={`-- ${t("SELECT_NO_OPTION_SELECTED")} --`}
-				tabIndex={-1}
+				tabIndex={10}
 				autoFocus={true}
 				defaultOpen={true}
 			/>
 		</div>
 	) : (
-		<div onFocus={() => setEditMode(true)} className="show-edit" tabIndex={0}>
+		<div onClick={() => setEditMode(true)} className="show-edit">
 			<span className="editable preserve-newlines">
 				{text || t("SELECT_NO_OPTION_SELECTED")}
 			</span>
@@ -317,7 +317,7 @@ const EditableSingleValueTextArea = ({
 			/>
 		</div>
 	) : (
-		<div onFocus={() => setEditMode(true)} className="show-edit" tabIndex={0}>
+		<div onClick={() => setEditMode(true)} className="show-edit">
 			<span className="editable preserve-newlines">{text || ""}</span>
 			<div>
 				<i className="edit fa fa-pencil-square" />
@@ -359,7 +359,7 @@ const EditableSingleValue = ({
 			<input {...field} autoFocus={true} type="text" />
 		</div>
 	) : (
-		<div onFocus={() => setEditMode(true)} className="show-edit" tabIndex={0}>
+		<div onClick={() => setEditMode(true)} className="show-edit">
 			<span className="editable preserve-newlines">{text || ""}</span>
 			<div>
 				<i className="edit fa fa-pencil-square" />
@@ -417,7 +417,7 @@ const EditableSingleValueTime = ({
 			/>
 		</div>
 	) : (
-		<div onFocus={() => setEditMode(true)} className="show-edit" tabIndex={0}>
+		<div onClick={() => setEditMode(true)} className="show-edit">
 			<span className="editable preserve-newlines">
 				{t("dateFormats.dateTime.short", { dateTime: new Date(text) }) || ""}
 			</span>
diff --git a/src/components/shared/wizard/RenderMultiField.tsx b/src/components/shared/wizard/RenderMultiField.tsx
index b7cf2ae617..be0d4955b9 100644
--- a/src/components/shared/wizard/RenderMultiField.tsx
+++ b/src/components/shared/wizard/RenderMultiField.tsx
@@ -91,7 +91,6 @@ const RenderMultiField = ({
 						collection={fieldInfo.collection}
 						field={field}
 						fieldValue={fieldValue}
-						setEditMode={setEditMode}
 						inputValue={inputValue}
 						removeItem={removeItem}
 						handleChange={handleChange}
@@ -125,8 +124,6 @@ const RenderMultiField = ({
 
 // Renders multi select
 const EditMultiSelect = ({
-// @ts-expect-error TS(7031): Binding element 'setEditMode' implicitly has an 'a... Remove this comment to see the full error message
-	setEditMode,
 // @ts-expect-error TS(7031): Binding element 'collection' implicitly has an 'an... Remove this comment to see the full error message
 	collection,
 // @ts-expect-error TS(7031): Binding element 'handleKeyDown' implicitly has an ... Remove this comment to see the full error message
@@ -159,7 +156,7 @@ const EditMultiSelect = ({
 
 	return (
 		<>
-			<div onBlur={() => setEditMode(false)} ref={childRef}>
+			<div ref={childRef}>
 				<div>
 					<input
 						type="text"
@@ -255,7 +252,7 @@ const ShowValue : React.FC<{
 	fieldValue,
 }) => {
 	return (
-		<div onFocus={() => setEditMode(true)} className="show-edit" tabIndex={0}>
+		<div onClick={() => setEditMode(true)} className="show-edit">
 			{field.value instanceof Array && field.value.length !== 0 ? (
 				<ul>
 {/* @ts-expect-error TS(7006): Parameter 'item' implicitly has an 'any' type. */}