diff --git a/.changeset/green-garlics-cheer.md b/.changeset/green-garlics-cheer.md
new file mode 100644
index 0000000..fcd194b
--- /dev/null
+++ b/.changeset/green-garlics-cheer.md
@@ -0,0 +1,5 @@
+---
+"specif-ai": patch
+---
+
+refactor: Consolidate root directory selection into settings modal
diff --git a/ui/src/app/components/layout/header/header.component.html b/ui/src/app/components/layout/header/header.component.html
index ac91bb9..7974ae2 100644
--- a/ui/src/app/components/layout/header/header.component.html
+++ b/ui/src/app/components/layout/header/header.component.html
@@ -21,31 +21,15 @@ <h1 class="text-2xl text-secondary-50">
         </a>
       </div>
 
-      <div class="flex items-center gap-4">
-        <div
-          class="flex justify-center items-center h-8 w-8 rounded-full bg-transparent text-slate-400 hover:text-slate-600 hover:bg-slate-200 cursor-pointer"
-          role="button"
-          tabindex="0"
-          (click)="openSelectRootDirectoryModal()"
-          (keydown.enter)="openSelectRootDirectoryModal()"
-          (keydown.space)="
-            openSelectRootDirectoryModal(); $event.preventDefault()
-          "
-          matTooltip="Choose Destination Folder"
-        >
-          <ng-icon name="heroFolder" />
-        </div>
-
-        <button
-          (click)="openSettingsModal()"
-          (keydown.enter)="openSettingsModal()"
-          (keydown.space)="openSettingsModal(); $event.preventDefault()"
-          class="flex items-center justify-center font-medium opacity-100 transition-colors duration-300 px-3 py-2 gap-2 text-xs rounded-lg border border-slate-700 bg-transparent text-white hover:bg-slate-900"
-        >
-          <ng-icon name="heroCog8Tooth" strokeWidth="2" size="16" />
-          Settings
-        </button>
-      </div>
+      <button
+        (click)="openSettingsModal()"
+        (keydown.enter)="openSettingsModal()"
+        (keydown.space)="openSettingsModal(); $event.preventDefault()"
+        class="flex items-center justify-center font-medium opacity-100 transition-colors duration-300 px-3 py-2 gap-2 text-xs rounded-lg border border-slate-700 bg-transparent text-white hover:bg-slate-900"
+      >
+        <ng-icon name="heroCog8Tooth" strokeWidth="2" size="16" />
+        Settings
+      </button>
     </div>
   </div>
   <div class="w-full px-8 py-3 flex items-center justify-start">
diff --git a/ui/src/app/components/layout/header/header.component.ts b/ui/src/app/components/layout/header/header.component.ts
index cf8e855..aee7b81 100644
--- a/ui/src/app/components/layout/header/header.component.ts
+++ b/ui/src/app/components/layout/header/header.component.ts
@@ -1,10 +1,6 @@
 import { Component, inject } from '@angular/core';
-import { APP_CONSTANTS } from '../../../constants/app.constants';
-import { SelectRootDirectoryComponent } from '../../select-root-directory/select-root-directory.component';
 import { MatDialog } from '@angular/material/dialog';
-import { ElectronService } from '../../../services/electron/electron.service';
-import { NGXLogger } from 'ngx-logger';
-import { Router, RouterLink } from '@angular/router';
+import { RouterLink } from '@angular/router';
 import { SettingsComponent } from '../../settings/settings.component';
 import { AuthService } from '../../../services/auth/auth.service';
 import { environment } from '../../../../environments/environment';
@@ -12,11 +8,7 @@ import { NgIconComponent, provideIcons } from '@ng-icons/core';
 import { BreadcrumbsComponent } from '../../core/breadcrumbs/breadcrumbs.component';
 import { AsyncPipe, NgIf } from '@angular/common';
 import { MatTooltipModule } from '@angular/material/tooltip';
-import {
-  heroArrowRightOnRectangle,
-  heroCog8Tooth,
-  heroFolder,
-} from '@ng-icons/heroicons/outline';
+import { heroCog8Tooth } from '@ng-icons/heroicons/outline';
 
 @Component({
   selector: 'app-header',
@@ -31,55 +23,13 @@ import {
     AsyncPipe,
     MatTooltipModule,
   ],
-  viewProviders: [
-    provideIcons({ heroCog8Tooth, heroFolder, heroArrowRightOnRectangle }),
-  ],
+  viewProviders: [provideIcons({ heroCog8Tooth })],
 })
 export class HeaderComponent {
   protected themeConfiguration = environment.ThemeConfiguration;
 
   authService = inject(AuthService);
-  electronService = inject(ElectronService);
-  logger = inject(NGXLogger);
   dialog = inject(MatDialog);
-  router = inject(Router);
-
-  /**
-   * Prompts the user to select a root directory, saves the selected directory to local storage,
-   * and navigates to the '/apps' route or reloads the current page based on the current URL.
-   *
-   * @return {Promise<void>} A promise that resolves when the directory selection and navigation are complete.
-   */
-  async selectRootDirectory(): Promise<void> {
-    const response = await this.electronService.openDirectory();
-    this.logger.debug(response);
-    if (response.length > 0) {
-      localStorage.setItem(APP_CONSTANTS.WORKING_DIR, response[0]);
-      const currentConfig =
-        (await this.electronService.getStoreValue('APP_CONFIG')) || {};
-      const updatedConfig = { ...currentConfig, directoryPath: response[0] };
-      await this.electronService.setStoreValue('APP_CONFIG', updatedConfig);
-
-      this.logger.debug('===>', this.router.url);
-      if (this.router.url === '/apps') {
-        await this.electronService.reloadApp();
-      } else {
-        await this.router.navigate(['/apps']);
-      }
-    }
-  }
-
-  openSelectRootDirectoryModal() {
-    const modalRef = this.dialog.open(SelectRootDirectoryComponent, {
-      disableClose: true,
-    });
-
-    modalRef.afterClosed().subscribe((res) => {
-      if (res === true) {
-        this.selectRootDirectory().then();
-      }
-    });
-  }
 
   openSettingsModal() {
     this.dialog.open(SettingsComponent, {
diff --git a/ui/src/app/components/select-root-directory/select-root-directory.component.html b/ui/src/app/components/select-root-directory/select-root-directory.component.html
deleted file mode 100644
index 9a2c235..0000000
--- a/ui/src/app/components/select-root-directory/select-root-directory.component.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<div class="modal-wrapper">
-  <div class="modal-header flex items-center justify-between p-4 border-b">
-    <h4 class="text-lg font-medium">Choose Destination Folder</h4>
-    <button
-      type="button"
-      class="text-gray-400 bg-transparent hover:bg-gray-200 hover:text-gray-900 rounded-lg text-sm p-1.5 ml-auto inline-flex items-center focus:outline-none focus:ring-0"
-      data-dismiss="modal"
-      aria-label="Close"
-      (click)="closeModal()"
-    >
-      <ng-icon name="heroXMark"></ng-icon>
-    </button>
-  </div>
-  <div class="modal-body p-6">
-    <div class="flex w-full">
-      <input
-        type="text"
-        [value]="workingDir"
-        placeholder="Choose Destination Folder"
-        disabled
-        class="bg-gray-100 border border-gray-300 text-gray-400 text-sm rounded-l-lg block w-full p-2"
-      />
-      <app-button
-        [buttonContent]="'Browse'"
-        [theme]="'primary'"
-        [rounded]="'none'"
-        [roundedRight]="'lg'"
-        (click)="openFolderSelector()"
-      ></app-button>
-    </div>
-    <p class="mt-4 text-sm text-gray-500">
-      Select a folder to store the requirements generated by {{appName}}
-    </p>
-  </div>
-</div>
diff --git a/ui/src/app/components/select-root-directory/select-root-directory.component.scss b/ui/src/app/components/select-root-directory/select-root-directory.component.scss
deleted file mode 100644
index e69de29..0000000
diff --git a/ui/src/app/components/select-root-directory/select-root-directory.component.spec.ts b/ui/src/app/components/select-root-directory/select-root-directory.component.spec.ts
deleted file mode 100644
index cf7ecb1..0000000
--- a/ui/src/app/components/select-root-directory/select-root-directory.component.spec.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { SelectRootDirectoryComponent } from './select-root-directory.component';
-
-describe('SelectRootDirectoryComponent', () => {
-  let component: SelectRootDirectoryComponent;
-  let fixture: ComponentFixture<SelectRootDirectoryComponent>;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      declarations: [SelectRootDirectoryComponent]
-    });
-    fixture = TestBed.createComponent(SelectRootDirectoryComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/ui/src/app/components/select-root-directory/select-root-directory.component.ts b/ui/src/app/components/select-root-directory/select-root-directory.component.ts
deleted file mode 100644
index b5a6770..0000000
--- a/ui/src/app/components/select-root-directory/select-root-directory.component.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
-import { MatDialogRef } from '@angular/material/dialog';
-import { NgIconComponent } from '@ng-icons/core';
-import { environment } from 'src/environments/environment';
-import { APP_CONSTANTS } from '../../constants/app.constants';
-import { NgIf } from '@angular/common';
-import { ButtonComponent } from '../core/button/button.component';
-
-@Component({
-  selector: 'app-select-root-directory',
-  templateUrl: './select-root-directory.component.html',
-  styleUrls: ['./select-root-directory.component.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush,
-  standalone: true,
-  imports: [NgIconComponent, ButtonComponent],
-})
-export class SelectRootDirectoryComponent {
-  workingDir: string | null;
-  appName = environment.ThemeConfiguration.appName;
-
-  constructor(private modalRef: MatDialogRef<SelectRootDirectoryComponent>) {
-    this.workingDir = localStorage.getItem(APP_CONSTANTS.WORKING_DIR);
-  }
-
-  openFolderSelector() {
-    this.modalRef.close(true);
-  }
-
-  closeModal() {
-    this.modalRef.close(false);
-  }
-}
diff --git a/ui/src/app/components/settings/settings.component.html b/ui/src/app/components/settings/settings.component.html
index 30a927a..917afbc 100644
--- a/ui/src/app/components/settings/settings.component.html
+++ b/ui/src/app/components/settings/settings.component.html
@@ -1,9 +1,9 @@
-<div class="modal-wrapper w-[32rem] max-w-lg text-sm font-medium">
+<div class="modal-wrapper w-[30rem] max-w-lg text-sm font-medium">
   <div class="modal-header flex items-center justify-between px-4 pt-4">
     <h4 class="font-medium text-base">Settings</h4>
     <button
       type="button"
-      class="text-slate-400 bg-transparent hover:bg-slate-200 hover:text-slate-900 rounded-lg text-sm p-1.5 ml-auto inline-flex items-center focus:outline-none focus:ring-0"
+      class="text-slate-400 bg-transparent hover:bg-slate-200 hover:text-slate-900 rounded-lg p-1 ml-auto inline-flex items-center focus:outline-none focus:ring-0"
       data-dismiss="modal"
       aria-label="Close"
       (click)="closeModal()"
@@ -94,6 +94,30 @@ <h4 class="font-medium text-base">Settings</h4>
       </div>
     </div>
 
+    <!-- Destination Folder -->
+    <div class="space-y-1">
+      <label for="workingDir" class="block text-slate-500">
+        Folder to store the requirements generated by {{ appName }}
+      </label>
+      <div class="flex w-full">
+        <input
+          type="text"
+          [value]="workingDir"
+          placeholder="Choose Destination Folder"
+          disabled
+          id="workingDir"
+          class="bg-gray-100 border border-gray-300 text-gray-400 text-sm rounded-l-lg block w-full p-2"
+        />
+        <app-button
+          [buttonContent]="'Browse'"
+          [theme]="'primary'"
+          [rounded]="'none'"
+          [roundedRight]="'lg'"
+          (click)="openFolderSelector()"
+        ></app-button>
+      </div>
+    </div>
+
     <!-- Save and Cancel Buttons -->
     <div
       *ngIf="hasChanges"
diff --git a/ui/src/app/components/settings/settings.component.ts b/ui/src/app/components/settings/settings.component.ts
index 8d48da8..9ea9224 100644
--- a/ui/src/app/components/settings/settings.component.ts
+++ b/ui/src/app/components/settings/settings.component.ts
@@ -25,8 +25,14 @@ import { AuthService } from '../../services/auth/auth.service';
 import { ToasterService } from '../../services/toaster/toaster.service';
 import { ButtonComponent } from '../core/button/button.component';
 import { ConfirmationDialogComponent } from '../../components/confirmation-dialog/confirmation-dialog.component';
-import { CONFIRMATION_DIALOG } from '../../constants/app.constants';
+import {
+  APP_CONSTANTS,
+  CONFIRMATION_DIALOG,
+} from '../../constants/app.constants';
 import { environment } from 'src/environments/environment';
+import { ElectronService } from 'src/app/services/electron/electron.service';
+import { NGXLogger } from 'ngx-logger';
+import { Router } from '@angular/router';
 
 @Component({
   selector: 'app-settings',
@@ -52,11 +58,16 @@ export class SettingsComponent implements OnInit, OnDestroy {
   selectedProvider: FormControl = new FormControl();
   errorMessage: string = '';
   hasChanges: boolean = false;
+  workingDir: string | null;
+  appName = environment.ThemeConfiguration.appName;
   private subscriptions: Subscription = new Subscription();
   private initialModel: string = '';
   private initialProvider: string = '';
   protected themeConfiguration = environment.ThemeConfiguration;
 
+  electronService = inject(ElectronService);
+  logger = inject(NGXLogger);
+  router = inject(Router);
   dialog = inject(MatDialog);
   version: string = environment.APP_VERSION;
   currentYear = new Date().getFullYear();
@@ -67,7 +78,39 @@ export class SettingsComponent implements OnInit, OnDestroy {
     private authService: AuthService,
     private toasterService: ToasterService,
     private cdr: ChangeDetectorRef,
-  ) {}
+  ) {
+    this.workingDir = localStorage.getItem(APP_CONSTANTS.WORKING_DIR);
+  }
+
+  /**
+   * Prompts the user to select a root directory, saves the selected directory to local storage,
+   * and navigates to the '/apps' route or reloads the current page based on the current URL.
+   *
+   * @return {Promise<void>} A promise that resolves when the directory selection and navigation are complete.
+   */
+  async selectRootDirectory(): Promise<void> {
+    const response = await this.electronService.openDirectory();
+    this.logger.debug(response);
+    if (response.length > 0) {
+      localStorage.setItem(APP_CONSTANTS.WORKING_DIR, response[0]);
+      const currentConfig =
+        (await this.electronService.getStoreValue('APP_CONFIG')) || {};
+      const updatedConfig = { ...currentConfig, directoryPath: response[0] };
+      await this.electronService.setStoreValue('APP_CONFIG', updatedConfig);
+
+      this.logger.debug('===>', this.router.url);
+      if (this.router.url === '/apps') {
+        await this.electronService.reloadApp();
+      } else {
+        await this.router.navigate(['/apps']);
+      }
+    }
+  }
+
+  openFolderSelector() {
+    this.selectRootDirectory().then();
+    this.modalRef.close(true);
+  }
 
   ngOnInit(): void {
     this.subscriptions.add(
diff --git a/ui/src/app/pages/create-solution/create-solution.component.ts b/ui/src/app/pages/create-solution/create-solution.component.ts
index 84bbbfb..f4f6f6c 100644
--- a/ui/src/app/pages/create-solution/create-solution.component.ts
+++ b/ui/src/app/pages/create-solution/create-solution.component.ts
@@ -15,7 +15,6 @@ import { NGXLogger } from 'ngx-logger';
 import { AppSystemService } from '../../services/app-system/app-system.service';
 import { ElectronService } from '../../services/electron/electron.service';
 import { ToasterService } from '../../services/toaster/toaster.service';
-import { SelectRootDirectoryComponent } from '../../components/select-root-directory/select-root-directory.component';
 import { NgIf } from '@angular/common';
 import { NgxLoadingModule } from 'ngx-loading';
 import { ButtonComponent } from '../../components/core/button/button.component';
@@ -27,6 +26,7 @@ import {
 import { InputFieldComponent } from '../../components/core/input-field/input-field.component';
 import { TextareaFieldComponent } from '../../components/core/textarea-field/textarea-field.component';
 import { ToggleComponent } from '../../components/toggle/toggle.component';
+import { SettingsComponent } from 'src/app/components/settings/settings.component';
 
 @Component({
   selector: 'app-create-solution',
@@ -116,14 +116,9 @@ export class CreateSolutionComponent implements OnInit {
   }
 
   openSelectRootDirectoryModal() {
-    const modalRef = this.dialog.open(SelectRootDirectoryComponent, {
+    this.dialog.open(SettingsComponent, {
       disableClose: true,
     });
-    modalRef.afterClosed().subscribe((res) => {
-      if (res === true) {
-        this.selectRootDirectory().then();
-      }
-    });
   }
 
   async selectRootDirectory(): Promise<void> {