diff --git a/src/SourceGit/ViewModels/Repository.cs b/src/SourceGit/ViewModels/Repository.cs
index 3c7e5af7..ee684ee3 100644
--- a/src/SourceGit/ViewModels/Repository.cs
+++ b/src/SourceGit/ViewModels/Repository.cs
@@ -210,6 +210,20 @@ namespace SourceGit.ViewModels
             set => SetProperty(ref _searchedCommits, value);
         }
 
+        [JsonIgnore]
+        public bool IsTagGroupExpanded
+        {
+            get => _isTagGroupExpanded;
+            set => SetProperty(ref _isTagGroupExpanded, value);
+        }
+
+        [JsonIgnore]
+        public bool IsSubmoduleGroupExpanded
+        {
+            get => _isSubmoduleGroupExpanded;
+            set => SetProperty(ref _isSubmoduleGroupExpanded, value);
+        }
+
         public void Open()
         {
             _watcher = new Models.Watcher(this);
@@ -250,6 +264,9 @@ namespace SourceGit.ViewModels
             _isSearching = false;
             _searchCommitFilter = string.Empty;
 
+            _isTagGroupExpanded = false;
+            _isSubmoduleGroupExpanded = false;
+
             _remotes.Clear();
             _branches.Clear();
             _localBranchTrees.Clear();
@@ -1265,6 +1282,9 @@ namespace SourceGit.ViewModels
         private string _searchCommitFilter = string.Empty;
         private List<Models.Commit> _searchedCommits = new List<Models.Commit>();
 
+        private bool _isTagGroupExpanded = false;
+        private bool _isSubmoduleGroupExpanded = false;
+
         private List<Models.Remote> _remotes = new List<Models.Remote>();
         private List<Models.Branch> _branches = new List<Models.Branch>();
         private List<Models.BranchTreeNode> _localBranchTrees = new List<Models.BranchTreeNode>();
diff --git a/src/SourceGit/Views/Repository.axaml b/src/SourceGit/Views/Repository.axaml
index e10ead2f..419ab893 100644
--- a/src/SourceGit/Views/Repository.axaml
+++ b/src/SourceGit/Views/Repository.axaml
@@ -241,7 +241,7 @@
         </TreeView>
 
         <!-- Tags -->
-        <ToggleButton Grid.Row="6" x:Name="toggleTags" Classes="group_expander">
+        <ToggleButton Grid.Row="6" Classes="group_expander" IsChecked="{Binding IsTagGroupExpanded, Mode=TwoWay}">
           <Grid ColumnDefinitions="Auto,*,Auto">
             <TextBlock Grid.Column="0" Classes="group_header_label" Margin="4,0,0,0" Text="{DynamicResource Text.Repository.Tags}"/>
             <TextBlock Grid.Column="1" Text="{Binding Tags, Converter={x:Static c:ListConverters.ToCount}}" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold"/>
@@ -265,7 +265,7 @@
                   HorizontalScrollBarVisibility="Disabled"
                   VerticalScrollBarVisibility="Auto"
                   LostFocus="OnTagDataGridLostFocus"
-                  IsVisible="{Binding #toggleTags.IsChecked}"
+                  IsVisible="{Binding IsTagGroupExpanded, Mode=OneWay}"
                   SelectionChanged="OnTagDataGridSelectionChanged"
                   ContextRequested="OnTagContextRequested">
           <DataGrid.Columns>
@@ -301,7 +301,7 @@
         </DataGrid>
 
         <!-- Submodules -->
-        <ToggleButton Grid.Row="8" x:Name="toggleSubmodules" Classes="group_expander">
+        <ToggleButton Grid.Row="8" Classes="group_expander" IsChecked="{Binding IsSubmoduleGroupExpanded, Mode=TwoWay}">
           <Grid ColumnDefinitions="Auto,*,Auto,Auto">
             <TextBlock Grid.Column="0" Classes="group_header_label" Margin="4,0,0,0" Text="{DynamicResource Text.Repository.Submodules}"/>
             <TextBlock Grid.Column="1" Text="{Binding Submodules, Converter={x:Static c:ListConverters.ToCount}}" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold"/>
@@ -334,7 +334,7 @@
                   HorizontalScrollBarVisibility="Disabled"
                   VerticalScrollBarVisibility="Auto"
                   ContextRequested="OnSubmoduleContextRequested"
-                  IsVisible="{Binding #toggleSubmodules.IsChecked}">
+                  IsVisible="{Binding IsSubmoduleGroupExpanded, Mode=OneWay}">
           <DataGrid.Columns>
             <DataGridTemplateColumn Header="ICON">
               <DataGridTemplateColumn.CellTemplate>