diff --git a/src/ui/components/MacroViewer.tsx b/src/ui/components/MacroViewer.tsx
index b6443ca..6f486e6 100644
--- a/src/ui/components/MacroViewer.tsx
+++ b/src/ui/components/MacroViewer.tsx
@@ -1,5 +1,6 @@
 import { Platform } from "obsidian";
 import { Fragment, h } from "preact";
+import { useState } from "preact/hooks";
 import t from "src/l10n";
 import CommanderPlugin from "src/main";
 import { Macro } from "src/types";
@@ -12,10 +13,13 @@ interface MacroBuilderProps {
 	plugin: CommanderPlugin;
 	macros: Macro[];
 }
-export default function MacroViewer(
-	this: { forceUpdate: () => void },
-	{ plugin, macros }: MacroBuilderProps
-): h.JSX.Element {
+export default function MacroViewer({
+	plugin,
+	macros,
+}: MacroBuilderProps): h.JSX.Element {
+	const [, setUpdateTick] = useState(0);
+	const forceUpdate = (): void => setUpdateTick((tick) => tick + 1);
+
 	const handleBuilder = (macro: Macro, idx?: number): void => {
 		const onClose = (updatedMacro: Macro): void => {
 			macros.splice(
@@ -25,7 +29,7 @@ export default function MacroViewer(
 			);
 
 			void plugin.saveSettings();
-			this.forceUpdate();
+			forceUpdate();
 			updateMacroCommands(plugin);
 			modal.close();
 		};
@@ -36,7 +40,7 @@ export default function MacroViewer(
 	const handleDelete = (idx: number): void => {
 		macros.splice(idx, 1);
 		void plugin.saveSettings();
-		this.forceUpdate();
+		forceUpdate();
 		updateMacroCommands(plugin);
 	};
 
diff --git a/src/ui/components/commandViewerComponent.tsx b/src/ui/components/commandViewerComponent.tsx
index f734191..3287f41 100644
--- a/src/ui/components/commandViewerComponent.tsx
+++ b/src/ui/components/commandViewerComponent.tsx
@@ -1,4 +1,5 @@
 import { createContext, Fragment, h } from "preact";
+import { useState } from "preact/hooks";
 import CommanderPlugin from "src/main";
 import CommandComponent from "./commandComponent";
 import CommandManagerBase from "src/manager/commands/commandManager";
@@ -18,10 +19,15 @@ interface CommandViewerProps {
 	children?: h.JSX.Element | h.JSX.Element[];
 	sortable?: boolean;
 }
-export default function CommandViewer(
-	this: { forceUpdate: () => void },
-	{ manager, plugin, children, sortable = true }: CommandViewerProps
-): h.JSX.Element {
+export default function CommandViewer({
+	manager,
+	plugin,
+	children,
+	sortable = true,
+}: CommandViewerProps): h.JSX.Element {
+	const [, setUpdateTick] = useState(0);
+	const forceUpdate = (): void => setUpdateTick((tick) => tick + 1);
+
 	return (
 		<Fragment>
 			<ManagerContext.Provider value={manager}>
@@ -45,7 +51,7 @@ export default function CommandViewer(
 											).didChooseRemove())
 										) {
 											await manager.removeCommand(cmd);
-											this.forceUpdate();
+											forceUpdate();
 										}
 									}}
 									handleUp={(): void => {
@@ -55,7 +61,7 @@ export default function CommandViewer(
 											idx - 1
 										);
 										void manager.reorder();
-										this.forceUpdate();
+										forceUpdate();
 									}}
 									handleDown={(): void => {
 										arrayMoveMutable(
@@ -64,7 +70,7 @@ export default function CommandViewer(
 											idx + 1
 										);
 										void manager.reorder();
-										this.forceUpdate();
+										forceUpdate();
 									}}
 									handleRename={async (
 										name
@@ -72,7 +78,7 @@ export default function CommandViewer(
 										cmd.name = name;
 										await plugin.saveSettings();
 										await manager.reorder();
-										this.forceUpdate();
+										forceUpdate();
 									}}
 									handleNewIcon={async (): Promise<void> => {
 										const newIcon =
@@ -83,7 +89,7 @@ export default function CommandViewer(
 											cmd.icon = newIcon;
 											await plugin.saveSettings();
 											await manager.reorder();
-											this.forceUpdate();
+											forceUpdate();
 										}
 										dispatchEvent(
 											new Event("cmdr-icon-changed")
@@ -108,7 +114,7 @@ export default function CommandViewer(
 											mode || modes[currentIdx + 1];
 										await plugin.saveSettings();
 										await manager.reorder();
-										this.forceUpdate();
+										forceUpdate();
 									}}
 									handleColorChange={async (
 										color?: string
@@ -116,7 +122,7 @@ export default function CommandViewer(
 										cmd.color = color;
 										await plugin.saveSettings();
 										await manager.reorder();
-										this.forceUpdate();
+										forceUpdate();
 									}}
 								/>
 							);
@@ -146,7 +152,7 @@ export default function CommandViewer(
 							const pair = await chooseNewCommand(plugin);
 							await manager.addCommand(pair);
 							await manager.reorder();
-							this.forceUpdate();
+							forceUpdate();
 						}}
 					>
 						{t("Add command")}
diff --git a/src/ui/components/mobileModifyComponent.tsx b/src/ui/components/mobileModifyComponent.tsx
index 34644e6..eddfb5f 100644
--- a/src/ui/components/mobileModifyComponent.tsx
+++ b/src/ui/components/mobileModifyComponent.tsx
@@ -1,24 +1,23 @@
 import { h } from "preact";
-import { useEffect } from "preact/hooks";
+import { useEffect, useState } from "preact/hooks";
 import t from "src/l10n";
 import { ObsidianIcon } from "src/util";
 import MobileModifyModal from "../mobileModifyModal";
 import { ColorPicker } from "./ColorPicker";
 import CommanderPlugin from "src/main";
 
-export default function MobileModifyComponent(
-	this: { forceUpdate: () => void },
-	{
-		plugin,
-		modal: controller,
-	}: {
-		plugin: CommanderPlugin;
-		modal: MobileModifyModal;
-	}
-): h.JSX.Element {
+export default function MobileModifyComponent({
+	plugin,
+	modal: controller,
+}: {
+	plugin: CommanderPlugin;
+	modal: MobileModifyModal;
+}): h.JSX.Element {
+	const [, setUpdateTick] = useState(0);
+
 	useEffect(() => {
 		const update = (): void => {
-			this.forceUpdate();
+			setUpdateTick((tick) => tick + 1);
 		};
 		addEventListener("cmdr-icon-changed", update);
 		return (): void => removeEventListener("cmdr-icon-changed", update);