diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2fd77c62..fff920ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 - (**Manga**) Fix failing migration with disabled "tracking" data
 - (**Manga**) Fix showing private tracking option for trackers which do not support the option
 - (**Manga**) Fix redirection to tracker settings in case no tracker is logged in
+- (**Manga**) Fix closing the category select dialog after clicking edit/create button while adding an entry to the library
 - (**Library**) Fix showing incorrect info text for an empty category
 - (**Browse**) Prevent infinite loading in case the whole source catalogue has been added to the library and the "hide entries in library" setting is enabled
 - (**Browse**) Fix using incorrect native language name for some sources (e.g., different chinese languages (zh-hans, zh-hant, ...) were all showing the same native name)
diff --git a/src/features/category/components/CategorySelect.tsx b/src/features/category/components/CategorySelect.tsx
index 53f7f4b5..371bfad6 100644
--- a/src/features/category/components/CategorySelect.tsx
+++ b/src/features/category/components/CategorySelect.tsx
@@ -244,7 +244,11 @@ export function CategorySelect(props: CategorySelectProps) {
                             width: '100%',
                         }}
                     >
-                        <Button component={Link} to={AppRoutes.settings.childRoutes.categories.path}>
+                        <Button
+                            component={Link}
+                            to={AppRoutes.settings.childRoutes.categories.path}
+                            onClick={onDismiss}
+                        >
                             {t(allCategories.length ? 'global.button.edit' : 'global.button.create')}
                         </Button>
                         <Stack direction="row">