diff --git a/FModel/MainWindow.xaml b/FModel/MainWindow.xaml
index 53fef5c7..2d7b3561 100644
--- a/FModel/MainWindow.xaml
+++ b/FModel/MainWindow.xaml
@@ -170,7 +170,7 @@
                               IsChecked="{Binding IsAutoOpenSounds, Source={x:Static local:Settings.UserSettings.Default}}" />
                     <MenuItem Header="Open Model Viewer" IsCheckable="True" StaysOpenOnClick="True"
                               InputGestureText="{Binding AutoOpenMeshes, Source={x:Static local:Settings.UserSettings.Default}}"
-                              IsChecked="{Binding AutoOpenMeshes, Source={x:Static local:Settings.UserSettings.Default}}" />
+                              IsChecked="{Binding IsAutoOpenMeshes, Source={x:Static local:Settings.UserSettings.Default}}" />
                 </MenuItem>
             </MenuItem>
             <MenuItem Header="Views">
@@ -898,6 +898,19 @@
                         </StatusBarItem.Style>
                         <TextBlock HorizontalAlignment="Center" FontWeight="SemiBold" Text="SND" />
                     </StatusBarItem>
+
+                    <StatusBarItem Width="33" HorizontalContentAlignment="Stretch" ToolTip="Auto Open Meshes Enabled">
+                        <StatusBarItem.Style>
+                            <Style TargetType="StatusBarItem">
+                                <Style.Triggers>
+                                    <DataTrigger Binding="{Binding IsAutoOpenMeshes, Source={x:Static local:Settings.UserSettings.Default}}" Value="False">
+                                        <Setter Property="Visibility" Value="Hidden" />
+                                    </DataTrigger>
+                                </Style.Triggers>
+                            </Style>
+                        </StatusBarItem.Style>
+                        <TextBlock HorizontalAlignment="Center" FontWeight="SemiBold" Text="OMV" />
+                    </StatusBarItem>
                 </StackPanel>
             </StatusBarItem>
         </StatusBar>
diff --git a/FModel/MainWindow.xaml.cs b/FModel/MainWindow.xaml.cs
index 3f008200..f5591944 100644
--- a/FModel/MainWindow.xaml.cs
+++ b/FModel/MainWindow.xaml.cs
@@ -41,6 +41,8 @@ namespace FModel
                 {new KeyGesture(UserSettings.Default.AutoSaveAnimations.Key, UserSettings.Default.AutoSaveAnimations.Modifiers)}), OnAutoTriggerExecuted));
             CommandBindings.Add(new CommandBinding(new RoutedCommand("AutoOpenSounds", typeof(MainWindow), new InputGestureCollection
                 {new KeyGesture(UserSettings.Default.AutoOpenSounds.Key, UserSettings.Default.AutoOpenSounds.Modifiers)}), OnAutoTriggerExecuted));
+            CommandBindings.Add(new CommandBinding(new RoutedCommand("AutoOpenMeshes", typeof(MainWindow), new InputGestureCollection
+                {new KeyGesture(UserSettings.Default.AutoOpenMeshes.Key, UserSettings.Default.AutoOpenMeshes.Modifiers)}), OnAutoTriggerExecuted));
             CommandBindings.Add(new CommandBinding(new RoutedCommand("ReloadMappings", typeof(MainWindow), new InputGestureCollection {new KeyGesture(Key.F12)}), OnMappingsReload));
             CommandBindings.Add(new CommandBinding(ApplicationCommands.Find, (s, e) => OnOpenAvalonFinder()));
 
@@ -160,6 +162,9 @@ namespace FModel
                 case "AutoOpenSounds":
                     UserSettings.Default.IsAutoOpenSounds = !UserSettings.Default.IsAutoOpenSounds;
                     break;
+                case "AutoOpenMeshes":
+                    UserSettings.Default.IsAutoOpenMeshes = !UserSettings.Default.IsAutoOpenMeshes;
+                    break;
             }
         }
 
diff --git a/FModel/ViewModels/ModelViewerViewModel.cs b/FModel/ViewModels/ModelViewerViewModel.cs
index caa486dc..02166f4c 100644
--- a/FModel/ViewModels/ModelViewerViewModel.cs
+++ b/FModel/ViewModels/ModelViewerViewModel.cs
@@ -74,7 +74,7 @@ namespace FModel.ViewModels
             set
             {
                 SetProperty(ref _selectedGeometry, value);
-                if (!_geometries.TryGetValue(_selectedGeometry, out var camAxis)) return;
+                if (_selectedGeometry == null || !_geometries.TryGetValue(_selectedGeometry, out var camAxis)) return;
 
                 XAxis = camAxis.XAxis;
                 YAxis = camAxis.YAxis;