diff --git a/client/src/Components/v2/inputs/Dialog.tsx b/client/src/Components/v2/inputs/Dialog.tsx
index 12831d4c4..717126edb 100644
--- a/client/src/Components/v2/inputs/Dialog.tsx
+++ b/client/src/Components/v2/inputs/Dialog.tsx
@@ -59,14 +59,16 @@ export const DialogInput = ({
 				>
 					{cancelText ?? t("common.buttons.cancel")}
 				</Button>
-				<Button
-					loading={loading}
-					variant="contained"
-					color={confirmColor}
-					onClick={onConfirm}
-				>
-					{confirmText ?? t("common.buttons.confirm")}
-				</Button>
+				{onConfirm && (
+					<Button
+						loading={loading}
+						variant="contained"
+						color={confirmColor}
+						onClick={onConfirm}
+					>
+						{confirmText ?? t("common.buttons.confirm")}
+					</Button>
+				)}
 			</DialogActions>
 		</Dialog>
 	);
diff --git a/client/src/Pages/Incidents/Components/ControlsIncidentFilter.tsx b/client/src/Pages/Incidents/Components/ControlsIncidentFilter.tsx
index 1298057ff..186942cf0 100644
--- a/client/src/Pages/Incidents/Components/ControlsIncidentFilter.tsx
+++ b/client/src/Pages/Incidents/Components/ControlsIncidentFilter.tsx
@@ -6,7 +6,7 @@ import { Typography, useTheme } from "@mui/material";
 import { useTranslation } from "react-i18next";
 import type { Monitor } from "@/Types/Monitor";
 
-const resolutionTypes = ["manual", "automatic"];
+const resolutionTypes = ["all", "manual", "automatic"];
 
 interface ControlsIncidentFilterProps {
 	monitors?: Monitor[];
diff --git a/client/src/Pages/Incidents/Components/DialogIncidentDetails.tsx b/client/src/Pages/Incidents/Components/DialogIncidentDetails.tsx
index da24538e2..daef58f68 100644
--- a/client/src/Pages/Incidents/Components/DialogIncidentDetails.tsx
+++ b/client/src/Pages/Incidents/Components/DialogIncidentDetails.tsx
@@ -22,13 +22,15 @@ export const DialogIncidentDetails = ({
 }: DialogIncidentDetailsProps) => {
 	const { t } = useTranslation();
 
+	const isActive = incident?.status === true;
+
 	return (
 		<Dialog
 			open={open}
 			onCancel={onClose}
-			onConfirm={onResolve}
-			cancelText={t("common.buttons.cancel")}
-			confirmText={t("pages.incidents.dialog.details.resolve")}
+			onConfirm={isActive ? onResolve : undefined}
+			cancelText={t("common.buttons.close")}
+			confirmText={isActive ? t("pages.incidents.dialog.details.resolve") : undefined}
 			maxWidth="sm"
 			fullWidth
 		>
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index af638e48d..81924ad57 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -188,6 +188,7 @@
 		},
 		"buttons": {
 			"cancel": "Cancel",
+			"close": "Close",
 			"configure": "Configure",
 			"confirm": "Confirm",
 			"create": "Create",
@@ -653,6 +654,10 @@
 					"overview": "Overview",
 					"resolutionDetails": "Resolution details",
 					"resolutionType": "Type:",
+					"resolutionTypes": {
+						"automatic": "Automatic",
+						"manual": "Manual"
+					},
 					"resolve": "Resolve Incident",
 					"resolvedAt": "Resolved at:",
 					"resolvedBy": "Resolved by:",