diff --git a/App.xaml b/App.xaml
index 6c920ed..7b2d341 100644
--- a/App.xaml
+++ b/App.xaml
@@ -1,8 +1,7 @@
 <Application x:Class="StructureHelper.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:StructureHelper"
-             StartupUri="Windows/MainWindow/MainView.xaml">
+             xmlns:local="clr-namespace:StructureHelper">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
diff --git a/App.xaml.cs b/App.xaml.cs
index 835413f..da89033 100644
--- a/App.xaml.cs
+++ b/App.xaml.cs
@@ -11,23 +11,30 @@ namespace StructureHelper
     public partial class App : Application
     {
         public static IContainer Container { get; private set; }
+        public static ILifetimeScope Scope { get; private set; }
+
         protected override void OnStartup(StartupEventArgs e)
         {
+            base.OnStartup(e);
             var builder = new ContainerBuilder();
-            builder.RegisterType<PrimitiveRepository>().As<IPrimitiveRepository>();
-            builder.RegisterType<PrimitiveService>().As<IPrimitiveService>();
-            builder.RegisterType<MainModel>().AsSelf();
-            builder.RegisterType<MainViewModel>().AsSelf();
+            builder.RegisterType<PrimitiveRepository>().As<IPrimitiveRepository>().SingleInstance();
+            builder.RegisterType<PrimitiveService>().As<IPrimitiveService>().SingleInstance();
+            builder.RegisterType<MainModel>().AsSelf().SingleInstance();
+            builder.RegisterType<MainViewModel>().AsSelf().SingleInstance();
 
             builder.RegisterType<MainView>().AsSelf();
 
             Container = builder.Build();
-            
-            using (var scope = Container.BeginLifetimeScope())
-            {
-                var window = scope.Resolve<MainView>();
-                window.ShowDialog();
-            }
+            Scope = Container.Resolve<ILifetimeScope>();
+
+            var window = Scope.Resolve<MainView>();
+            window.Show();
+        }
+
+        protected override void OnExit(ExitEventArgs e)
+        {
+            Scope.Dispose();
+            base.OnExit(e);
         }
     }
 }