diff --git a/SuperScreenShotterVR/MainController.cs b/SuperScreenShotterVR/MainController.cs
index ba47e54..f152093 100644
--- a/SuperScreenShotterVR/MainController.cs
+++ b/SuperScreenShotterVR/MainController.cs
@@ -30,6 +30,7 @@ public class MainController
         private bool _initComplete = false;
         private bool _isHookedForScreenshots = false;
         private string _currentAppId = "";
+        private string _currentAppName = "";
         private ulong _notificationOverlayHandle = 0;
         private Dictionary<uint, ScreenshotData> _screenshotQueue = new Dictionary<uint, ScreenshotData>();
         private uint _lastScreenshotHandle = 0;
@@ -149,6 +150,7 @@ private void WorkerThread()
                         UpdateScreenshotHook();
                         PlayScreenshotSound(true);
                         _currentAppId = _ovr.GetRunningApplicationId();
+                        _currentAppName = _ovr.GetApplicationPropertyString(_currentAppId, EVRApplicationProperty.Name_String);
                         AppUpdateAction.Invoke(_currentAppId);
                         // ToggleViewfinder(true); // DEBUG
                         UpdateTrackedDeviceIndex();
@@ -185,6 +187,7 @@ private void WorkerThread()
                         
                         _notificationOverlayHandle = _ovr.InitNotificationOverlay("SuperScreenShotterVR");
                         _currentAppId = _ovr.GetRunningApplicationId();
+                        _currentAppName = _ovr.GetApplicationPropertyString(_currentAppId, EVRApplicationProperty.Name_String);
 
                         // Events
                         _ovr.RegisterEvent(EVREventType.VREvent_RequestScreenshot, (data) => { 
@@ -432,13 +435,22 @@ public void UpdateOutputFolder(bool createDirIfNeeded = false, string subfolder
             {
                 var dir = _settings.Directory;
                 if (createDirIfNeeded && !Directory.Exists(dir)) Directory.CreateDirectory(dir);
-                if(_currentAppId != string.Empty)
+
+                if (_settings.OutputAppname && _currentAppName != string.Empty)
+                {
+                    Debug.WriteLine($"Settings subfolder to: steam.app.{_currentAppName}");
+                    dir = $"{dir}\\steam.app.{_currentAppName}";
+                    if (subfolder != string.Empty) dir = $"{dir}\\{subfolder}";
+                    if (createDirIfNeeded && !Directory.Exists(dir)) Directory.CreateDirectory(dir);
+                }
+                else if (_currentAppId != string.Empty)
                 {
                     Debug.WriteLine($"Settings subfolder to: {_currentAppId}");
                     dir = $"{dir}\\{_currentAppId}";
                     if (subfolder != string.Empty) dir = $"{dir}\\{subfolder}";
                     if (createDirIfNeeded && !Directory.Exists(dir)) Directory.CreateDirectory(dir);
-                } else
+                }
+                else
                 {
                     if (subfolder != string.Empty) dir = $"{dir}\\{subfolder}";
                 }
diff --git a/SuperScreenShotterVR/MainWindow.xaml b/SuperScreenShotterVR/MainWindow.xaml
index b9f6bde..b194d32 100644
--- a/SuperScreenShotterVR/MainWindow.xaml
+++ b/SuperScreenShotterVR/MainWindow.xaml
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:SuperScreenShotterVR"
         mc:Ignorable="d"
-        Title="SuperScreenShotterVR" Height="500" Width="840" Icon="resources/logo.ico" StateChanged="Window_StateChanged">
+        Title="SuperScreenShotterVR" Height="520" Width="840" Icon="resources/logo.ico" StateChanged="Window_StateChanged">
     <Grid Grid.Row="2">
         <Grid.ColumnDefinitions>
             <ColumnDefinition/>
@@ -83,6 +83,7 @@
                     </StackPanel>
                     <CheckBox x:Name="CheckBoxSubmitToSteam" Margin="5 0 5 5" Content="Submit screenshots to Steam screenshot library" Checked="CheckBox_SubmitToSteam_Checked" Unchecked="CheckBox_SubmitToSteam_Checked"/>
                     <CheckBox x:Name="CheckBoxSaveRightImage" Margin="5 0 5 5" Content="Also save an image for the right eye" Checked="CheckBox_SaveRightImage_Checked" Unchecked="CheckBox_SaveRightImage_Checked"/>
+                    <CheckBox x:Name="CheckBoxOutputAppname" Margin="5 0 5 5" Content="Using application name instaed of appid for output folder" Checked="CheckBox_OutputAppname_Checked" Unchecked="CheckBox_OutputAppname_Checked"/>
                     <StackPanel Orientation="Horizontal">
                         <Label Content="Output folder:"/>
                         <Button x:Name="ButtonBrowseDirectory" Padding="4" Content="Browse..." Click="Button_BrowseDirectory_Click"/>
diff --git a/SuperScreenShotterVR/MainWindow.xaml.cs b/SuperScreenShotterVR/MainWindow.xaml.cs
index e960ca7..6e63bce 100644
--- a/SuperScreenShotterVR/MainWindow.xaml.cs
+++ b/SuperScreenShotterVR/MainWindow.xaml.cs
@@ -139,6 +139,7 @@ private void InitSettings()
             CheckBoxLockHorizon.IsChecked = _settings.LockHorizon;
             CheckBoxIndicateDegrees.IsChecked = _settings.IndicateDegrees;
             CheckBoxSaveRightImage.IsChecked = _settings.SaveRightImage;
+            CheckBoxOutputAppname.IsChecked = _settings.OutputAppname;
             CheckBoxCaptureTimer.IsChecked = _settings.CaptureTimer;
             TextBoxTimerSeconds.Text = _settings.TimerSeconds.ToString();
             CheckBoxDelayCapture.IsChecked = _settings.DelayCapture;
@@ -466,6 +467,12 @@ private void CheckBox_EnableHotkeys_Checked(object sender, RoutedEventArgs e)
             UpdateHotkey(HotkeyIdViewfinder);
         }
 
+        private void CheckBox_OutputAppname_Checked(object sender, RoutedEventArgs e)
+        {
+            _settings.OutputAppname = CheckboxValue(e);
+            _settings.Save();
+        }
+
         private void CheckBox_ScreenshotHotkeyAlt_Checked(object sender, RoutedEventArgs e)
         {
             _settings.HotkeyScreenshotAlt = CheckboxValue(e);
diff --git a/SuperScreenShotterVR/Properties/Settings.Designer.cs b/SuperScreenShotterVR/Properties/Settings.Designer.cs
index 3374eeb..32c8716 100644
--- a/SuperScreenShotterVR/Properties/Settings.Designer.cs
+++ b/SuperScreenShotterVR/Properties/Settings.Designer.cs
@@ -237,6 +237,19 @@ public bool SaveRightImage {
                 this["SaveRightImage"] = value;
             }
         }
+
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        public bool OutputAppname
+        {
+            get {
+                return ((bool)(this["OutputAppname"]));
+            }
+            set {
+                this["OutputAppname"] = value;
+            }
+        }
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]