diff --git a/packages/web_ui/src/components/ModsPage.tsx b/packages/web_ui/src/components/ModsPage.tsx
index ef8d83d4..3b0654c4 100644
--- a/packages/web_ui/src/components/ModsPage.tsx
+++ b/packages/web_ui/src/components/ModsPage.tsx
@@ -172,6 +172,7 @@ function SearchModsButton() {
 			setLoading(false);
 		});
 
+		// eslint-disable-next-line consistent-return
 		return () => {
 			canceled = true;
 		};
@@ -202,6 +203,13 @@ function SearchModsButton() {
 		}
 	};
 
+	const getColumnSortOrder = (columnKey: string): "ascend" | "descend" | undefined => {
+		if (sort === columnKey) {
+			return sortOrder === "asc" ? "ascend" : "descend";
+		}
+		return undefined;
+	};
+
 	return <>
 		<Button icon={<SearchOutlined />} onClick={() => { setOpen(true); }}>Search</Button>
 		<Modal
@@ -295,21 +303,21 @@ function SearchModsButton() {
 						dataIndex: "name",
 						key: "name",
 						sorter: true,
-						sortOrder: sort === "name" ? (sortOrder === "asc" ? "ascend" : "descend") : undefined,
+						sortOrder: getColumnSortOrder("name"),
 					},
 					{
 						title: "Title",
 						dataIndex: "title",
 						key: "title",
 						sorter: true,
-						sortOrder: sort === "title" ? (sortOrder === "asc" ? "ascend" : "descend") : undefined,
+						sortOrder: getColumnSortOrder("title"),
 					},
 					{
 						title: "Author",
 						dataIndex: "owner",
 						key: "owner",
 						sorter: true,
-						sortOrder: sort === "owner" ? (sortOrder === "asc" ? "ascend" : "descend") : undefined,
+						sortOrder: getColumnSortOrder("owner"),
 					},
 					{
 						title: "Latest Version",