diff --git a/gradle/changelog/search_pagination.yaml b/gradle/changelog/search_pagination.yaml
new file mode 100644
index 0000000000..2e6705c4e3
--- /dev/null
+++ b/gradle/changelog/search_pagination.yaml
@@ -0,0 +1,2 @@
+- type: fixed
+  description: Keep search context for search results pagination ([#2115](https://github.com/scm-manager/scm-manager/pull/2115))
diff --git a/scm-ui/ui-webapp/src/search/Search.tsx b/scm-ui/ui-webapp/src/search/Search.tsx
index 5b0fee651c..4a611543a2 100644
--- a/scm-ui/ui-webapp/src/search/Search.tsx
+++ b/scm-ui/ui-webapp/src/search/Search.tsx
@@ -172,6 +172,8 @@ const Search: FC = () => {
     ...searchCounts,
   };
 
+  const contextQuery = `${query}${namespace ? "&namespace=" + namespace : ""}${name ? "&name=" + name : ""}`;
+
   return (
     <Page
       title={t("search.title")}
@@ -183,7 +185,7 @@ const Search: FC = () => {
       {data ? (
         <CustomQueryFlexWrappedColumns>
           <PrimaryContentColumn>
-            <Results result={data} query={query} page={page} type={selectedType} />
+            <Results result={data} query={contextQuery} page={page} type={selectedType} />
           </PrimaryContentColumn>
           <SecondaryNavigation label={t("search.types")} collapsible={false}>
             {types.map((type) =>
@@ -203,14 +205,7 @@ const Search: FC = () => {
                   </DisabledNavLink>
                 </li>
               ) : (
-                <NavLink
-                  key={type}
-                  to={`/search/${type}/?q=${query}${namespace ? "&namespace=" + namespace : ""}${
-                    name ? "&name=" + name : ""
-                  }`}
-                  label={type}
-                  activeOnlyWhenExact={false}
-                >
+                <NavLink key={type} to={`/search/${type}/?q=${contextQuery}`} label={type} activeOnlyWhenExact={false}>
                   <Level
                     left={t(`plugins:search.types.${type}.navItem`, type)}
                     right={