diff --git a/ShareX.MediaLib/VideoConverterOptions.cs b/ShareX.MediaLib/VideoConverterOptions.cs
index 67813b37a..90ad458be 100644
--- a/ShareX.MediaLib/VideoConverterOptions.cs
+++ b/ShareX.MediaLib/VideoConverterOptions.cs
@@ -39,14 +39,20 @@ public string OutputFilePath
         {
             get
             {
-                if (string.IsNullOrEmpty(OutputFolderPath) || string.IsNullOrEmpty(OutputFileName))
+                string path = "";
+
+                if (!string.IsNullOrEmpty(OutputFolderPath) && !string.IsNullOrEmpty(OutputFileName))
                 {
-                    return "";
+                    path = Path.Combine(OutputFolderPath, OutputFileName);
+
+                    if (!Path.HasExtension(OutputFileName))
+                    {
+                        string extension = GetFileExtension();
+                        path = Path.ChangeExtension(path, extension);
+                    }
                 }
 
-                string path = Path.Combine(OutputFolderPath, OutputFileName);
-                string extension = GetFileExtension();
-                return Path.ChangeExtension(path, extension);
+                return path;
             }
         }
 
diff --git a/ShareX/Tools/PinToScreen/PinToScreenForm.cs b/ShareX/Tools/PinToScreen/PinToScreenForm.cs
index 9a45529c7..d37abb799 100644
--- a/ShareX/Tools/PinToScreen/PinToScreenForm.cs
+++ b/ShareX/Tools/PinToScreen/PinToScreenForm.cs
@@ -143,6 +143,8 @@ private PinToScreenForm(PinToScreenOptions options)
             ImageOpacity = Options.InitialOpacity;
 
             InitializeComponent();
+            // TODO: Add options form
+            tsbOptions.Visible = false;
             ShareXResources.ApplyTheme(this);
             TopMost = Options.TopMost;
             SetStyle(ControlStyles.AllPaintingInWmPaint | ControlStyles.OptimizedDoubleBuffer | ControlStyles.UserPaint, true);