diff --git a/src/App/Pages/Settings/FolderAddEditPage.xaml b/src/App/Pages/Settings/FolderAddEditPage.xaml
index ac1dfcd4a..00bd81f7e 100644
--- a/src/App/Pages/Settings/FolderAddEditPage.xaml
+++ b/src/App/Pages/Settings/FolderAddEditPage.xaml
@@ -31,7 +31,9 @@
                     <Entry
                         Text="{Binding Folder.Name}"
                         StyleClass="box-value"
-                        x:Name="_nameEntry" />
+                        x:Name="_nameEntry"
+                        ReturnType="Go"
+                        ReturnCommand="{Binding SubmitCommand}" />
                 </StackLayout>
             </StackLayout>
         </StackLayout>
diff --git a/src/App/Pages/Settings/FolderAddEditPageViewModel.cs b/src/App/Pages/Settings/FolderAddEditPageViewModel.cs
index 4350a307a..3b90300b4 100644
--- a/src/App/Pages/Settings/FolderAddEditPageViewModel.cs
+++ b/src/App/Pages/Settings/FolderAddEditPageViewModel.cs
@@ -5,6 +5,7 @@ using Bit.Core.Exceptions;
 using Bit.Core.Models.View;
 using Bit.Core.Utilities;
 using System.Threading.Tasks;
+using Xamarin.Forms;
 
 namespace Bit.App.Pages
 {
@@ -20,8 +21,11 @@ namespace Bit.App.Pages
             _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
             _folderService = ServiceContainer.Resolve<IFolderService>("folderService");
             _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
+
+            SubmitCommand = new Command(async () => await SubmitAsync());
         }
 
+        public Command SubmitCommand { get; }
         public string FolderId { get; set; }
         public FolderView Folder
         {