diff --git a/ModernKeePass/ResourceDictionaries/TextBoxWithButtonStyle.xaml b/ModernKeePass/ResourceDictionaries/TextBoxWithButtonStyle.xaml
index b8880a8..6ad9db9 100644
--- a/ModernKeePass/ResourceDictionaries/TextBoxWithButtonStyle.xaml
+++ b/ModernKeePass/ResourceDictionaries/TextBoxWithButtonStyle.xaml
@@ -291,7 +291,7 @@
                                          TextWrapping="NoWrap"
                                          VerticalAlignment="Stretch"
                                          Margin="0"
-                                         Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay, Path=Text}" />
+                                         Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay, Path=Text, UpdateSourceTrigger=PropertyChanged}" />
                                 <Button x:Name="ActionButton"
                                         AutomationProperties.AccessibilityView="Raw"
                                         Background="Transparent"
@@ -301,7 +301,8 @@
                                         Style="{StaticResource ActionButtonStyle}"
                                         Content="{TemplateBinding ButtonSymbol}"
                                         IsEnabled="{TemplateBinding IsButtonEnabled}"
-                                        Command="{TemplateBinding ButtonCommand}">
+                                        Command="{TemplateBinding ButtonCommand}"
+                                        CommandParameter="{TemplateBinding ButtonCommandParameter}">
                                     <ToolTipService.ToolTip>
                                         <ToolTip Content="{TemplateBinding ButtonTooltip}" />
                                     </ToolTipService.ToolTip>
diff --git a/ModernKeePass/Strings/en-US/Resources.resw b/ModernKeePass/Strings/en-US/Resources.resw
index 6d7f319..828d18f 100644
--- a/ModernKeePass/Strings/en-US/Resources.resw
+++ b/ModernKeePass/Strings/en-US/Resources.resw
@@ -513,4 +513,7 @@
   <data name="SettingsSaveDatabaseSuspendDesc.Text" xml:space="preserve">
     <value>This settings is generally recommended. If you enable it, database will automatically be saved on application suspension and closing, provided your database is less than 1MB big. Saving bigger databases may take too long and Windows may then forcibly kill the app before saving is finished, resulting in your changes not being saved.</value>
   </data>
+  <data name="NewGroupTextBox" xml:space="preserve">
+    <value>New group name</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/ModernKeePass/Strings/fr-FR/Resources.resw b/ModernKeePass/Strings/fr-FR/Resources.resw
index a27f962..63caad3 100644
--- a/ModernKeePass/Strings/fr-FR/Resources.resw
+++ b/ModernKeePass/Strings/fr-FR/Resources.resw
@@ -516,4 +516,7 @@
   <data name="CompositeKeyConfirmPassword.PlaceholderText" xml:space="preserve">
     <value>Confirmer le mot de passe</value>
   </data>
+  <data name="NewGroupTextBox" xml:space="preserve">
+    <value>Nom du groupe</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/ModernKeePass/ViewModels/GroupDetailVm.cs b/ModernKeePass/ViewModels/GroupDetailVm.cs
index b15ccfe..f719813 100644
--- a/ModernKeePass/ViewModels/GroupDetailVm.cs
+++ b/ModernKeePass/ViewModels/GroupDetailVm.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.Linq;
@@ -27,7 +26,6 @@ using ModernKeePass.Application.Group.Commands.SortGroups;
 using ModernKeePass.Application.Group.Commands.UpdateGroup;
 using ModernKeePass.Application.Group.Models;
 using ModernKeePass.Application.Group.Queries.GetGroup;
-using ModernKeePass.Application.Group.Queries.SearchEntries;
 using ModernKeePass.Common;
 using ModernKeePass.Domain.Enums;
 using ModernKeePass.Domain.Exceptions;
@@ -92,7 +90,7 @@ namespace ModernKeePass.ViewModels
         public RelayCommand SortGroupsCommand { get; }
         public RelayCommand<string> MoveCommand { get; }
         public RelayCommand CreateEntryCommand { get; }
-        public RelayCommand CreateGroupCommand { get; }
+        public RelayCommand<string> CreateGroupCommand { get; }
         public RelayCommand DeleteCommand { get; set; }
         public RelayCommand GoBackCommand { get; set; }
         public RelayCommand GoToParentCommand { get; set; }
@@ -122,7 +120,7 @@ namespace ModernKeePass.ViewModels
             SortGroupsCommand = new RelayCommand(async () => await SortGroupsAsync(), () => IsEditMode);
             MoveCommand = new RelayCommand<string>(async destination => await Move(destination), destination => IsNotRoot && !string.IsNullOrEmpty(destination) && destination != Id);
             CreateEntryCommand = new RelayCommand(async () => await AddNewEntry(), () => !IsInRecycleBin && Database.RecycleBinId != Id);
-            CreateGroupCommand = new RelayCommand(async () => await AddNewGroup(), () => !IsInRecycleBin && Database.RecycleBinId != Id);
+            CreateGroupCommand = new RelayCommand<string>(async newGroupName => await AddNewGroup(newGroupName), _ => !IsInRecycleBin && Database.RecycleBinId != Id);
             DeleteCommand = new RelayCommand(async () => await AskForDelete(),() => IsNotRoot);
             GoBackCommand = new RelayCommand(() => _navigation.GoBack());
             GoToParentCommand= new RelayCommand(() => GoToGroup(_parent.Id), () => _parent != null);
@@ -163,7 +161,7 @@ namespace ModernKeePass.ViewModels
         public async Task AddNewGroup(string name = "")
         {
             var group = await _mediator.Send(new CreateGroupCommand {Name = name, ParentGroup = _group});
-            GoToGroup(group.Id, true);
+            Groups.Add(group);
         }
         
         public async Task AddNewEntry()
diff --git a/ModernKeePass/Views/UserControls/HamburgerMenuUserControl.xaml b/ModernKeePass/Views/UserControls/HamburgerMenuUserControl.xaml
index ba2b629..6611de4 100644
--- a/ModernKeePass/Views/UserControls/HamburgerMenuUserControl.xaml
+++ b/ModernKeePass/Views/UserControls/HamburgerMenuUserControl.xaml
@@ -8,6 +8,8 @@
     xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
     xmlns:core="using:Microsoft.Xaml.Interactions.Core"
     xmlns:converters="using:ModernKeePass.Converters"
+    xmlns:actions="using:ModernKeePass.Actions"
+    xmlns:controls="using:ModernKeePass.Controls"
     mc:Ignorable="d">
     <UserControl.Resources>
         <converters:IconToSymbolConverter x:Key="IconToSymbolConverter"/>
@@ -111,19 +113,18 @@
             <ListView.ItemTemplateSelector>
                 <templateSelectors:SelectableDataTemplateSelector FalseItem="{StaticResource IsNormal}" TrueItem="{StaticResource IsSpecial}" />
             </ListView.ItemTemplateSelector>
-            <ListView.FooterTemplate>
+            <ListView.HeaderTemplate>
                 <DataTemplate>
-                    <StackPanel Orientation="Vertical">
-                        <Border BorderBrush="DarkGray" BorderThickness="0,0,0,1" />
-                        <Button Padding="0" Margin="0" 
-                                Height="{StaticResource MenuWidth}" 
-                                Visibility="{Binding IsButtonVisible, ElementName=UserControl}" 
-                                Style="{StaticResource NoBorderButtonStyle}" 
-                                Background="Transparent" 
-                                BorderThickness="0" 
-                                Width="{StaticResource ExpandedMenuSize}" 
-                                HorizontalContentAlignment="Left" 
-                                Command="{Binding ActionButtonCommand, ElementName=UserControl}">
+                    <StackPanel Orientation="Vertical" Visibility="{Binding IsButtonVisible, ElementName=UserControl}">
+                        <Button x:Name="NewGroupButton"
+                            Padding="0" Margin="0" 
+                            Height="{StaticResource MenuWidth}" 
+                            Visibility="{Binding IsButtonVisible, ElementName=UserControl}" 
+                            Style="{StaticResource NoBorderButtonStyle}" 
+                            Background="Transparent" 
+                            BorderThickness="0" 
+                            Width="{StaticResource ExpandedMenuSize}" 
+                            HorizontalContentAlignment="Left">
                             <StackPanel Orientation="Horizontal" Margin="17,0,5,0">
                                 <SymbolIcon Symbol="Add">
                                     <ToolTipService.ToolTip>
@@ -132,7 +133,42 @@
                                 </SymbolIcon>
                                 <TextBlock Text="{Binding ButtonLabel, ElementName=UserControl}" FontWeight="SemiBold" TextWrapping="NoWrap" FontSize="16" VerticalAlignment="Center" Margin="30,0,20,0" />
                             </StackPanel>
+                            <interactivity:Interaction.Behaviors>
+                                <core:EventTriggerBehavior EventName="Click">
+                                    <core:ChangePropertyAction TargetObject="{Binding ElementName=NewGroupTextBox}" PropertyName="Visibility" Value="Visible" />
+                                    <core:ChangePropertyAction TargetObject="{Binding ElementName=NewGroupButton}" PropertyName="Visibility" Value="Collapsed" />
+                                    <actions:SetupFocusAction TargetObject="{Binding ElementName=NewGroupTextBox}" />
+                                </core:EventTriggerBehavior>
+                            </interactivity:Interaction.Behaviors>
                         </Button>
+                        <controls:TextBoxWithButton 
+                            x:Uid="NewGroupTextBox" 
+                            x:Name="NewGroupTextBox" 
+                            Margin="0,5,0,5" 
+                            Visibility="Collapsed"
+                            Width="280"
+                            HorizontalAlignment="Center"
+                            ButtonCommand="{Binding ActionButtonCommand, ElementName=UserControl}" 
+                            ButtonCommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=Text}"
+                            Style="{StaticResource TextBoxWithButtonStyle}"
+                            KeyDown="NewGroupTextBox_OnKeyDown"
+                            ButtonSymbol="&#xE111;">
+                            <interactivity:Interaction.Behaviors>
+                                <core:EventTriggerBehavior EventName="LostFocus">
+                                    <core:ChangePropertyAction TargetObject="{Binding ElementName=NewGroupButton}" PropertyName="Visibility" Value="Visible" />
+                                    <core:ChangePropertyAction TargetObject="{Binding ElementName=NewGroupTextBox}" PropertyName="Visibility" Value="Collapsed" />
+                                    <core:ChangePropertyAction TargetObject="{Binding ElementName=NewGroupTextBox}" PropertyName="Text" Value="" />
+                                </core:EventTriggerBehavior>
+                            </interactivity:Interaction.Behaviors>
+                        </controls:TextBoxWithButton>
+                        <Border BorderBrush="DarkGray" BorderThickness="0,0,0,1" />
+                    </StackPanel>
+                </DataTemplate>
+            </ListView.HeaderTemplate>
+            <ListView.FooterTemplate>
+                <DataTemplate>
+                    <StackPanel Orientation="Vertical">
+                        <Border BorderBrush="DarkGray" BorderThickness="0,0,0,1" />
                         <Button Padding="0" Margin="0" 
                                 Height="{StaticResource MenuWidth}" 
                                 Style="{StaticResource NoBorderButtonStyle}" 
diff --git a/ModernKeePass/Views/UserControls/HamburgerMenuUserControl.xaml.cs b/ModernKeePass/Views/UserControls/HamburgerMenuUserControl.xaml.cs
index 8571a1d..b644be8 100644
--- a/ModernKeePass/Views/UserControls/HamburgerMenuUserControl.xaml.cs
+++ b/ModernKeePass/Views/UserControls/HamburgerMenuUserControl.xaml.cs
@@ -1,9 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.Windows.Input;
+using Windows.System;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Input;
 using ModernKeePass.Application.Common.Interfaces;
+using ModernKeePass.Controls;
 
 // The User Control item template is documented at http://go.microsoft.com/fwlink/?LinkId=234236
 
@@ -11,11 +14,6 @@ namespace ModernKeePass.Views.UserControls
 {
     public sealed partial class HamburgerMenuUserControl
     {
-        public HamburgerMenuUserControl()
-        {
-            InitializeComponent();
-        }
-
         public string HeaderLabel
         {
             get { return (string)GetValue(HeaderLabelProperty); }
@@ -112,9 +110,14 @@ namespace ModernKeePass.Views.UserControls
                 typeof(ICommand),
                 typeof(HamburgerMenuUserControl),
                 new PropertyMetadata(null, (o, args) => { }));
-
-
+        
         public event EventHandler<SelectionChangedEventArgs> SelectionChanged;
+        
+        public HamburgerMenuUserControl()
+        {
+            InitializeComponent();
+        }
+
         private void Selector_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             SelectionChanged?.Invoke(sender, e);
@@ -126,5 +129,14 @@ namespace ModernKeePass.Views.UserControls
             if (parent == null) return;
             VisualStateManager.GoToState(this, parent.ActualWidth <= 640 ? "Hidden" : "Collapsed", true);
         }
+
+        private void NewGroupTextBox_OnKeyDown(object sender, KeyRoutedEventArgs e)
+        {
+            if (e.Key != VirtualKey.Enter) return;
+            var textBox = sender as TextBoxWithButton;
+            ActionButtonCommand.Execute(textBox?.Text);
+            // Stop the event from triggering twice
+            e.Handled = true;
+        }
     }
 }
diff --git a/ModernKeePass/Views/UserControls/TopMenuUserControl.xaml b/ModernKeePass/Views/UserControls/TopMenuUserControl.xaml
index e595cb7..21722f1 100644
--- a/ModernKeePass/Views/UserControls/TopMenuUserControl.xaml
+++ b/ModernKeePass/Views/UserControls/TopMenuUserControl.xaml
@@ -124,7 +124,6 @@
                     <core:EventTriggerBehavior EventName="Click">
                         <core:ChangePropertyAction TargetObject="{Binding ElementName=SearchBox}" PropertyName="Visibility" Value="Visible" />
                         <core:ChangePropertyAction TargetObject="{Binding ElementName=SearchButton}" PropertyName="Visibility" Value="Collapsed" />
-                        <!-- TODO: make this work -->
                         <actions:SetupFocusAction TargetObject="{Binding ElementName=SearchBox}" />
                     </core:EventTriggerBehavior>
                 </interactivity:Interaction.Behaviors>
diff --git a/WinAppCommon/Controls/TextBoxWithButton.cs b/WinAppCommon/Controls/TextBoxWithButton.cs
index 52b9ab3..7558e10 100644
--- a/WinAppCommon/Controls/TextBoxWithButton.cs
+++ b/WinAppCommon/Controls/TextBoxWithButton.cs
@@ -57,6 +57,18 @@ namespace ModernKeePass.Controls
                 typeof(TextBoxWithButton),
                 new PropertyMetadata(null, (o, args) => { }));
 
+        public string ButtonCommandParameter
+        {
+            get { return (string)GetValue(ButtonCommandParameterProperty); }
+            set { SetValue(ButtonCommandParameterProperty, value); }
+        }
+        public static readonly DependencyProperty ButtonCommandParameterProperty =
+            DependencyProperty.Register(
+                nameof(ButtonCommandParameter),
+                typeof(string),
+                typeof(TextBoxWithButton),
+                new PropertyMetadata(null, (o, args) => { }));
+
         public bool IsButtonEnabled
         {
             get { return (bool)GetValue(IsButtonEnabledProperty); }