diff --git a/Controls/TexturePicker.xaml b/Controls/TexturePicker.xaml
index 0490a5b..a4a0c14 100644
--- a/Controls/TexturePicker.xaml
+++ b/Controls/TexturePicker.xaml
@@ -84,6 +84,26 @@
                                                             </Style>
                                                         </Button.Style>
                                                     </Button>
+                                                    <Button HorizontalAlignment="Left" Width="20"  Grid.Column="0" Margin="0,0,2,0" Command="{Binding RelativeSource={RelativeSource AncestorLevel=1, AncestorType=Window},Path=EditHostDevicesCommand}" CommandParameter="{Binding}">
+                                                        <Button.Style>
+                                                            <Style TargetType="{x:Type Button}" BasedOn="{StaticResource blank}">
+                                                                <Setter Property="Content" >
+                                                                    <Setter.Value>
+                                                                        <Path Fill="Sienna" Data="{DynamicResource Geometry.HostDevices}" Style="{StaticResource DropShadow}"/>
+                                                                    </Setter.Value>
+                                                                </Setter>
+                                                                <Style.Triggers>
+                                                                    <Trigger Property="IsMouseOver" Value="True">
+                                                                        <Setter Property="Content">
+                                                                            <Setter.Value>
+                                                                                <Path Fill="LightGray" Data="{DynamicResource Geometry.HostDevices}" Style="{StaticResource DropShadow}"/>
+                                                                            </Setter.Value>
+                                                                        </Setter>
+                                                                    </Trigger>
+                                                                </Style.Triggers>
+                                                            </Style>
+                                                        </Button.Style>
+                                                    </Button>
                                                 </Grid>
                                                 <TextBox Grid.Row="1" Padding="2" Margin="1" HorizontalAlignment="Center" MinWidth="50" Text="{Binding TextureHash, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" BorderBrush="{Binding HashProperties.IsValid, Converter={StaticResource BoolToBrushConverter}}"/>
                                             </Grid>
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index b533d31..6cfdaea 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -38,6 +38,7 @@ private DynamicInputPackViewModel InputPack
             set
             {
                 value.CheckImagePaths();
+                _edit_host_devices_window?.Close();
                 DataContext = value;
                 ((PanZoomViewModel)PanZoom.DataContext).InputPack = value;
                 UnsavedChanges = false;
@@ -48,6 +49,7 @@ private DynamicInputPackViewModel InputPack
 
         private Window _edit_emulated_devices_window;
         private Window _edit_default_host_devices_window;
+        private Window _edit_host_devices_window;
         private Window _edit_metadata_window;
 
         private void ExportToLocation_Click(object sender, RoutedEventArgs e)
@@ -84,6 +86,29 @@ private void EditDefaultHostDevices_Click(object sender, RoutedEventArgs e)
             _edit_default_host_devices_window.Show();
         }
 
+        public ICommand EditHostDevicesCommand => new ViewModels.Commands.RelayCommand<Data.DynamicInputTexture>(EditHostDevicesS);
+
+        private void EditHostDevicesS(Data.DynamicInputTexture texture)
+        {
+            _edit_host_devices_window?.Close();
+
+            var user_control = new HostDeviceKeyViewModel { HostDevices = new ViewModels.Commands.UICollection<Data.HostDevice>(texture.HostDevices) };
+            texture.HostDevices = user_control.HostDevices;
+
+            _edit_host_devices_window = new Window
+            {
+                Title = "Editing Host Devices of " + texture.TextureHash,
+                ResizeMode = ResizeMode.CanResize,
+                SizeToContent = SizeToContent.Manual,
+                Owner = Application.Current.MainWindow,
+                Top = this.Top + 50, Left = this.Left + 70,
+                Width = 620, Height = 550, MinWidth = 500, MinHeight = 400,
+                Content = new Controls.EditHostDevices { DataContext = user_control }
+            };
+
+            _edit_host_devices_window.Show();
+        }
+
         private void EditEmulatedDevices_Click(object sender, RoutedEventArgs e)
         {
             _edit_emulated_devices_window?.Close();