diff --git a/Pkmds.Web/Components/EditForms/HiddenPowerChooser.razor b/Pkmds.Web/Components/EditForms/HiddenPowerChooser.razor
new file mode 100644
index 00000000..2e1543aa
--- /dev/null
+++ b/Pkmds.Web/Components/EditForms/HiddenPowerChooser.razor
@@ -0,0 +1,39 @@
+@if (Pokemon is not null)
+{
+    <MudStack Spacing="1">
+        <MudAlert Severity="@MudBlazor.Severity.Info">
+            Changing Hidden Power type might change the IVs of the Pokémon.
+        </MudAlert>
+        <MudStack Row
+                  AlignItems="@AlignItems.Center">
+            <MudSelect Label="Hidden Power Type"
+                       Variant="@Variant.Outlined"
+                       @bind-Value="@Pokemon.HPType">
+                @foreach (var type in Util.GetCBList(GameInfo.Strings.Types.ToArray().AsSpan(1, 16)).DistinctBy(type => type.Value))
+                {
+                    <MudSelectItem Value="@type.Value"
+                                   @key="@type.Value">
+                        <MudStack Row>
+                            <MudImage Src="@SpriteHelper.GetTypeSquareSpriteFileName(type.Value + 1)"
+                                      Alt="@GameInfo.Strings.Types[type.Value + 1]"
+                                      title="@GameInfo.Strings.Types[type.Value + 1]"
+                                      ObjectFit="@ObjectFit.Contain"
+                                      ObjectPosition="@ObjectPosition.Center"
+                                      Width="30" />
+                            <MudText>
+                                @type.Text
+                            </MudText>
+                        </MudStack>
+                    </MudSelectItem>
+                }
+            </MudSelect>
+            <MudText>
+                @Pokemon.HPPower
+            </MudText>
+        </MudStack>
+    </MudStack>
+}
+
+@code {
+    [Parameter] public PKM? Pokemon { get; set; }
+}
diff --git a/Pkmds.Web/Components/EditForms/Tabs/MovesTab.razor b/Pkmds.Web/Components/EditForms/Tabs/MovesTab.razor
index 0297d69b..4bb5bff9 100644
--- a/Pkmds.Web/Components/EditForms/Tabs/MovesTab.razor
+++ b/Pkmds.Web/Components/EditForms/Tabs/MovesTab.razor
@@ -107,38 +107,7 @@ AppState.SelectedSlotsAreValid)
 
         @if (GameInfo.FilteredSources.Moves.Any(m => m.Value == (int)Move.HiddenPower) && Pokemon is not { Context: EntityContext.Gen8 or EntityContext.Gen9 })
         {
-            <MudStack Spacing="1">
-                <MudAlert Severity="@MudBlazor.Severity.Info">
-                    Changing Hidden Power type might change the IVs of the Pokémon.
-                </MudAlert>
-                <MudStack Row
-                          AlignItems="@AlignItems.Center">
-                    <MudSelect Label="Hidden Power Type"
-                               Variant="@Variant.Outlined"
-                               @bind-Value="@Pokemon.HPType">
-                        @foreach (var type in Util.GetCBList(GameInfo.Strings.Types.ToArray().AsSpan(1, 16)).DistinctBy(type => type.Value))
-                        {
-                            <MudSelectItem Value="@type.Value"
-                                           @key="@type.Value">
-                                <MudStack Row>
-                                    <MudImage Src="@SpriteHelper.GetTypeSquareSpriteFileName(type.Value + 1)"
-                                              Alt="@GameInfo.Strings.Types[type.Value + 1]"
-                                              title="@GameInfo.Strings.Types[type.Value + 1]"
-                                              ObjectFit="@ObjectFit.Contain"
-                                              ObjectPosition="@ObjectPosition.Center"
-                                              Width="30" />
-                                    <MudText>
-                                        @type.Text
-                                    </MudText>
-                                </MudStack>
-                            </MudSelectItem>
-                        }
-                    </MudSelect>
-                    <MudText>
-                        @Pokemon.HPPower
-                    </MudText>
-                </MudStack>
-            </MudStack>
+            <HiddenPowerChooser Pokemon="@Pokemon" />
         }
 
     </MudStack>
diff --git a/Pkmds.Web/Components/EditForms/Tabs/StatsTab.razor b/Pkmds.Web/Components/EditForms/Tabs/StatsTab.razor
index 1c4936ea..727cbdcf 100644
--- a/Pkmds.Web/Components/EditForms/Tabs/StatsTab.razor
+++ b/Pkmds.Web/Components/EditForms/Tabs/StatsTab.razor
@@ -598,38 +598,7 @@ AppState.SelectedSlotsAreValid)
 
     @if (GameInfo.FilteredSources.Moves.Any(m => m.Value == (int)Move.HiddenPower) && Pokemon is not { Context: EntityContext.Gen8 or EntityContext.Gen9 })
     {
-        <MudStack Spacing="1">
-            <MudAlert Severity="@MudBlazor.Severity.Info">
-                Changing Hidden Power type might change the IVs of the Pokémon.
-            </MudAlert>
-            <MudStack Row
-                      AlignItems="@AlignItems.Center">
-                <MudSelect Label="Hidden Power Type"
-                           Variant="@Variant.Outlined"
-                           @bind-Value="@Pokemon.HPType">
-                    @foreach (var type in Util.GetCBList(GameInfo.Strings.Types.ToArray().AsSpan(1, 16)).DistinctBy(type => type.Value))
-                    {
-                        <MudSelectItem Value="@type.Value"
-                                       @key="@type.Value">
-                            <MudStack Row>
-                                <MudImage Src="@SpriteHelper.GetTypeSquareSpriteFileName(type.Value + 1)"
-                                          Alt="@GameInfo.Strings.Types[type.Value + 1]"
-                                          title="@GameInfo.Strings.Types[type.Value + 1]"
-                                          ObjectFit="@ObjectFit.Contain"
-                                          ObjectPosition="@ObjectPosition.Center"
-                                          Width="30" />
-                                <MudText>
-                                    @type.Text
-                                </MudText>
-                            </MudStack>
-                        </MudSelectItem>
-                    }
-                </MudSelect>
-                <MudText>
-                    @Pokemon.HPPower
-                </MudText>
-            </MudStack>
-        </MudStack>
+        <HiddenPowerChooser Pokemon="@Pokemon"/>
     }
 
     @if (saveGeneration >= 4)
diff --git a/Pkmds.sln b/Pkmds.sln
index 7645a57d..a098b34a 100644
--- a/Pkmds.sln
+++ b/Pkmds.sln
@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# 17
+# Visual Studio Version 17
 VisualStudioVersion = 17.10.34902.84
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4C388A5C-FFB8-4330-A263-64B6CA1B2496}"