diff --git a/OtterGui b/OtterGui
index 5a2e12a1..c59b1c09 160000
--- a/OtterGui
+++ b/OtterGui
@@ -1 +1 @@
-Subproject commit 5a2e12a1acd6760a3a592447a92215135e79197c
+Subproject commit c59b1c09ff7b8093d3a70c45957f9c41341dd3a4
diff --git a/Penumbra/UI/ModsTab/ModPanelDescriptionTab.cs b/Penumbra/UI/ModsTab/ModPanelDescriptionTab.cs
index 4c5e68ff..e1b80b23 100644
--- a/Penumbra/UI/ModsTab/ModPanelDescriptionTab.cs
+++ b/Penumbra/UI/ModsTab/ModPanelDescriptionTab.cs
@@ -29,17 +29,18 @@ public class ModPanelDescriptionTab(
         ImGui.Dummy(ImGuiHelpers.ScaledVector2(2));
 
         ImGui.Dummy(ImGuiHelpers.ScaledVector2(2));
-        var sharedTagsEnabled     = predefinedTagsConfig.SharedTags.Count > 0;
-        var sharedTagButtonOffset = sharedTagsEnabled ? ImGui.GetFrameHeight() + ImGui.GetStyle().FramePadding.X : 0;
+        var (predefinedTagsEnabled, predefinedTagButtonOffset) = predefinedTagsConfig.SharedTags.Count > 0
+            ? (true, ImGui.GetFrameHeight() + ImGui.GetStyle().WindowPadding.X + (ImGui.GetScrollMaxY() > 0 ? ImGui.GetStyle().ScrollbarSize : 0))
+            : (false, 0);
         var tagIdx = _localTags.Draw("Local Tags: ",
             "Custom tags you can set personally that will not be exported to the mod data but only set for you.\n"
           + "If the mod already contains a local tag in its own tags, the local tag will be ignored.", selector.Selected!.LocalTags,
-            out var editedTag, rightEndOffset: sharedTagButtonOffset);
+            out var editedTag, rightEndOffset: predefinedTagButtonOffset);
         tutorial.OpenTutorial(BasicTutorialSteps.Tags);
         if (tagIdx >= 0)
             modManager.DataEditor.ChangeLocalTag(selector.Selected!, tagIdx, editedTag);
 
-        if (sharedTagsEnabled)
+        if (predefinedTagsEnabled)
             predefinedTagsConfig.DrawAddFromSharedTagsAndUpdateTags(selector.Selected!.LocalTags, selector.Selected!.ModTags, true,
                 selector.Selected!);
 
diff --git a/Penumbra/UI/PredefinedTagManager.cs b/Penumbra/UI/PredefinedTagManager.cs
index fafca101..b85b5dea 100644
--- a/Penumbra/UI/PredefinedTagManager.cs
+++ b/Penumbra/UI/PredefinedTagManager.cs
@@ -110,9 +110,7 @@ public sealed class PredefinedTagManager : ISavable
     public void DrawAddFromSharedTagsAndUpdateTags(IReadOnlyCollection<string> localTags, IReadOnlyCollection<string> modTags, bool editLocal,
         Mods.Mod mod)
     {
-        ImGui.SetCursorPosY(ImGui.GetCursorPosY() - ImGui.GetFrameHeightWithSpacing());
-        ImGui.SetCursorPosX(ImGui.GetWindowWidth() - ImGui.GetFrameHeight() - ImGui.GetStyle().FramePadding.X);
-
+        ImGui.SameLine(ImGui.GetContentRegionMax().X - ImGui.GetFrameHeight() - ImGui.GetStyle().WindowPadding.X);
         var sharedTag = DrawAddFromSharedTags(localTags, modTags, editLocal);
 
         if (sharedTag.Length > 0)