diff --git a/libs/angular-accelerator/src/lib/components/search-header/search-header.component.html b/libs/angular-accelerator/src/lib/components/search-header/search-header.component.html
index 01901255a..66f420232 100644
--- a/libs/angular-accelerator/src/lib/components/search-header/search-header.component.html
+++ b/libs/angular-accelerator/src/lib/components/search-header/search-header.component.html
@@ -33,7 +33,7 @@
         <ng-content></ng-content>
       </div>
     </div>
-    <div class="flex flex-wrap gap-2">
+    <div class="flex flex-wrap gap-2" [ngClass]="searchButtonsReversed ? 'flex-row-reverse' : 'flex-row'">
       <p-button
         id="resetButton"
         *ngIf="resetted.observed"
diff --git a/libs/angular-accelerator/src/lib/components/search-header/search-header.component.ts b/libs/angular-accelerator/src/lib/components/search-header/search-header.component.ts
index fca9765ab..ddc38f496 100644
--- a/libs/angular-accelerator/src/lib/components/search-header/search-header.component.ts
+++ b/libs/angular-accelerator/src/lib/components/search-header/search-header.component.ts
@@ -16,6 +16,7 @@ import { Action } from '../page-header/page-header.component'
 import { FormControlName, FormGroup, FormGroupDirective } from '@angular/forms'
 import { Observable, combineLatest, debounceTime, map, of, startWith } from 'rxjs'
 import { getLocation } from '@onecx/accelerator'
+import { CONFIG_KEY, ConfigurationService } from '@onecx/angular-integration-interface'
 
 export interface SearchHeaderComponentState {
   activeViewMode?: 'basic' | 'advanced'
@@ -120,17 +121,19 @@ export class SearchHeaderComponent implements AfterContentInit, AfterViewInit {
     show: 'always',
   }
   headerActions: Action[] = []
-
+  searchButtonsReversed = false
   fieldValues$: Observable<{ [key: string]: unknown }> | undefined = of({})
   searchConfigChangedSlotEmitter: EventEmitter<SearchConfigData | undefined> = new EventEmitter()
 
-  constructor() {
+  constructor(configurationService: ConfigurationService) {
     this.searchConfigChangedSlotEmitter.subscribe((config) => {
       this.componentStateChanged.emit({
         selectedSearchConfig: config?.name ?? null,
       })
       this.selectedSearchConfigChanged.emit(config)
     })
+    this.searchButtonsReversed =
+      configurationService.getProperty(CONFIG_KEY.ONECX_PORTAL_SEARCH_BUTTONS_REVERSED) === 'true'
   }
 
   ngAfterContentInit(): void {
diff --git a/libs/angular-accelerator/src/lib/components/search-header/search-header.stories.ts b/libs/angular-accelerator/src/lib/components/search-header/search-header.stories.ts
index 35e81df60..1c80cdca9 100644
--- a/libs/angular-accelerator/src/lib/components/search-header/search-header.stories.ts
+++ b/libs/angular-accelerator/src/lib/components/search-header/search-header.stories.ts
@@ -15,6 +15,8 @@ import { StorybookTranslateModule } from '../../storybook-translate.module'
 import { PageHeaderComponent } from '../page-header/page-header.component'
 import { StorybookBreadcrumbModule } from './../../storybook-breadcrumb.module'
 import { SearchHeaderComponent } from './search-header.component'
+import { ConfigurationService } from '@onecx/angular-integration-interface'
+import { provideHttpClient } from '@angular/common/http'
 
 export default {
   title: 'SearchHeaderComponent',
@@ -25,6 +27,8 @@ export default {
         importProvidersFrom(BrowserModule),
         importProvidersFrom(BrowserAnimationsModule),
         importProvidersFrom(RouterModule.forRoot([], { useHash: true })),
+        importProvidersFrom(ConfigurationService),
+        provideHttpClient(),
       ],
     }),
     moduleMetadata({
diff --git a/libs/angular-integration-interface/src/lib/model/config-key.model.ts b/libs/angular-integration-interface/src/lib/model/config-key.model.ts
index 4c14ebaf3..e7e59be2d 100644
--- a/libs/angular-integration-interface/src/lib/model/config-key.model.ts
+++ b/libs/angular-integration-interface/src/lib/model/config-key.model.ts
@@ -20,6 +20,7 @@ export enum CONFIG_KEY {
   ONECX_PORTAL_SETTINGS_DISABLED = 'ONECX_PORTAL_SETTINGS_DISABLED',
   ONECX_PORTAL_MY_ROLES_PERMISSIONS_DISABLED = 'ONECX_PORTAL_MY_ROLES_PERMISSIONS_DISABLED',
   ONECX_PORTAL_HELP_DISABLED = 'ONECX_PORTAL_HELP_DISABLED',
+  ONECX_PORTAL_SEARCH_BUTTONS_REVERSED = 'ONECX_PORTAL_SEARCH_BUTTONS_REVERSED',
   APP_VERSION = 'APP_VERSION',
   IS_SHELL = 'IS_SHELL',
   AUTH_SERVICE = 'AUTH_SERVICE',