diff --git a/CHANGELOG.md b/CHANGELOG.md
index c053940507..f78b9dad5e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Changed
+
+- Moved the tags to the overview tab of the account detail dialog (experimental)
+- Moved the tags to the overview tab of the holding detail dialog
+
 ### Fixed
 
 - Ignored future-dated account balances in the portfolio calculation
diff --git a/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.html b/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.html
index b7deae6e85..32a11717f8 100644
--- a/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.html
+++ b/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.html
@@ -112,6 +112,11 @@
                 >Platform</gf-value
               >
             </div>
+            @if (user?.settings?.isExperimentalFeatures) {
+              <div class="col-12 mb-3">
+                <gf-tags-selector [readonly]="true" [tags]="tags" />
+              </div>
+            }
           </div>
         </div>
       </mat-tab>
@@ -179,10 +184,6 @@
         />
       </mat-tab>
     </mat-tab-group>
-
-    @if (user?.settings?.isExperimentalFeatures) {
-      <gf-tags-selector [readonly]="true" [tags]="tags" />
-    }
   </div>
 </div>
 
diff --git a/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html b/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html
index 30222de65e..464f0b6b2b 100644
--- a/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html
+++ b/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html
@@ -331,6 +331,17 @@
                 >ISIN</gf-value
               >
             </div>
+            <div class="col-12 mb-3">
+              <form [formGroup]="holdingForm">
+                <gf-tags-selector
+                  formControlName="tags"
+                  [hasPermissionToCreateTag]="hasPermissionToCreateOwnTag"
+                  [readonly]="!data.hasPermissionToUpdateActivity"
+                  [tagsAvailable]="tagsAvailable"
+                  [tagsReadOnly]="tagsOfAccounts"
+                />
+              </form>
+            </div>
 
             @if (dataProviderInfo) {
               <div class="col-md-12 mb-3 text-center">
@@ -419,16 +430,6 @@
       }
     </mat-tab-group>
 
-    <form [formGroup]="holdingForm">
-      <gf-tags-selector
-        formControlName="tags"
-        [hasPermissionToCreateTag]="hasPermissionToCreateOwnTag"
-        [readonly]="!data.hasPermissionToUpdateActivity"
-        [tagsAvailable]="tagsAvailable"
-        [tagsReadOnly]="tagsOfAccounts"
-      />
-    </form>
-
     @if (
       data.hasPermissionToAccessAdminControl ||
       (dataSource?.data.length > 0 &&