diff --git a/templates/sheets/global/partials/inventory-item-V2.hbs b/templates/sheets/global/partials/inventory-item-V2.hbs
index 86d2e2d3..a758a28f 100644
--- a/templates/sheets/global/partials/inventory-item-V2.hbs
+++ b/templates/sheets/global/partials/inventory-item-V2.hbs
@@ -40,23 +40,20 @@ Parameters:
 
     {{!-- Name & Tags --}}
     <div class="item-label" draggable="true">
+        {{!-- Item Name --}}
+        <span class="item-name">{{localize item.name}} {{#unless (or noExtensible (not item.system.description))}}<span class="expanded-icon"><i class="fa-solid fa-expand"></i></span>{{/unless}}</span>
 
-      {{!-- Item Name --}}
-      <span class="item-name">{{localize item.name}} {{#unless (or noExtensible (not item.system.description))}}<span class="expanded-icon"><i class="fa-solid fa-expand"></i></span>{{/unless}}</span>
-
-      {{!-- Tags Start --}}
+        {{!-- Tags Start --}}
         {{#if (not ../hideTags)}}
-          {{#> "systems/daggerheart/templates/sheets/global/partials/item-tags.hbs" item  }}
-            {{#if (eq ../type 'feature')}}
-                {{#if (or (eq @root.document.type 'adversary') (eq @root.document.type 'environment'))}}
-                    {{#if system.featureForm}}
+            {{#> "systems/daggerheart/templates/sheets/global/partials/item-tags.hbs" item}}
+                {{#if (eq ../type 'feature')}}
+                    {{#if (and system.featureForm (or (eq @root.document.type "adversary") (eq @root.document.type "environment")))}}
                         <div class="tag feature-form">
                             <span class="recall-value">{{localize (concat "DAGGERHEART.CONFIG.FeatureForm." system.featureForm)}}</span>
                         </div>
                     {{/if}}
                 {{/if}}
-            {{/if}}
-          {{/ "systems/daggerheart/templates/sheets/global/partials/item-tags.hbs"}}
+            {{/ "systems/daggerheart/templates/sheets/global/partials/item-tags.hbs"}}
         {{/if}}
 
       {{!--Tags End --}}
diff --git a/templates/sheets/global/partials/item-tags.hbs b/templates/sheets/global/partials/item-tags.hbs
index b30fcbf2..2edc1eac 100644
--- a/templates/sheets/global/partials/item-tags.hbs
+++ b/templates/sheets/global/partials/item-tags.hbs
@@ -4,5 +4,5 @@
             {{tag}}
         </div>
     {{/each}}
-    {{#if @partial-block}}{{> @partial-block}}{{/if}}
+    {{> @partial-block}}
 </div>
\ No newline at end of file