diff --git a/ModernKeePass/Common/DatabaseHelper.cs b/ModernKeePass/Common/DatabaseHelper.cs
index d6e598a..8881712 100644
--- a/ModernKeePass/Common/DatabaseHelper.cs
+++ b/ModernKeePass/Common/DatabaseHelper.cs
@@ -40,10 +40,10 @@ namespace ModernKeePass.Common
             {
                 key.AddUserKey(new KcpPassword(password));
                 var ioConnection = IOConnectionInfo.FromFile(DatabaseFile);
-                if (createNew)
+                /*if (createNew)
                 {
-                    _pwDatabase.New(ioConnection, key);
-                }
+                    _pwDatabase.Save(new NullStatusLogger());
+                }*/
                 _pwDatabase.Open(ioConnection, key, new NullStatusLogger());
 
                 if (_pwDatabase.IsOpen)
diff --git a/ModernKeePass/Controls/OpenDatabaseUserControl.xaml.cs b/ModernKeePass/Controls/OpenDatabaseUserControl.xaml.cs
index 5128a00..c1f25e5 100644
--- a/ModernKeePass/Controls/OpenDatabaseUserControl.xaml.cs
+++ b/ModernKeePass/Controls/OpenDatabaseUserControl.xaml.cs
@@ -1,5 +1,4 @@
 using System.Threading.Tasks;
-using Windows.Storage;
 using Windows.System;
 using Windows.UI.Core;
 using Windows.UI.Xaml;
diff --git a/ModernKeePass/ViewModels/OpenVm.cs b/ModernKeePass/ViewModels/OpenVm.cs
index f8c6e90..51b4e13 100644
--- a/ModernKeePass/ViewModels/OpenVm.cs
+++ b/ModernKeePass/ViewModels/OpenVm.cs
@@ -18,6 +18,13 @@ namespace ModernKeePass.ViewModels
             get { return ((App)Application.Current).Database.Name; }
         }
 
+        public OpenVm()
+        {
+            var database = ((App)Application.Current).Database;
+            if (database == null || database.Status != DatabaseHelper.DatabaseStatus.Opening) return;
+            OpenFile(database.DatabaseFile);
+        }
+
         public event PropertyChangedEventHandler PropertyChanged;
         
         private void NotifyPropertyChanged(string propertyName)