diff --git a/LanguageBaseEnglish.xml b/LanguageBaseEnglish.xml
index 63148818a..c5ef88b29 100644
--- a/LanguageBaseEnglish.xml
+++ b/LanguageBaseEnglish.xml
@@ -1025,6 +1025,7 @@ We leverage the intrinsic rhythm of the image.</CreateSimpleChainingToolTip>
     <InputVideoFile>Input video file</InputVideoFile>
     <SubtitlesX>Subtitles ({0})</SubtitlesX>
     <SetLanguage>Set language...</SetLanguage>
+    <LanguageAndTitle>Language/title</LanguageAndTitle>
     <ToggleForced>Toggle forced</ToggleForced>
     <ToggleDefault>Toggle default</ToggleDefault>
     <Default>Default</Default>
diff --git a/src/ui/Forms/GenerateVideoWithSoftSubs.Designer.cs b/src/ui/Forms/GenerateVideoWithSoftSubs.Designer.cs
index 2777e5ad8..f3b058de5 100644
--- a/src/ui/Forms/GenerateVideoWithSoftSubs.Designer.cs
+++ b/src/ui/Forms/GenerateVideoWithSoftSubs.Designer.cs
@@ -36,6 +36,8 @@ namespace Nikse.SubtitleEdit.Forms
             this.buttonCancel = new System.Windows.Forms.Button();
             this.labelInputVideoFile = new System.Windows.Forms.Label();
             this.groupBoxSettings = new System.Windows.Forms.GroupBox();
+            this.contextMenuStripMain = new System.Windows.Forms.ContextMenuStrip(this.components);
+            this.setSuffixToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.labelNotSupported = new System.Windows.Forms.Label();
             this.buttonSetLanguage = new System.Windows.Forms.Button();
             this.buttonSetDefault = new System.Windows.Forms.Button();
@@ -66,6 +68,7 @@ namespace Nikse.SubtitleEdit.Forms
             this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
             this.viewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.buttonOpenVideoFile = new System.Windows.Forms.Button();
+            this.textBoxInputFileName = new Nikse.SubtitleEdit.Controls.NikseTextBox();
             this.contextMenuStripRes = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.x2160ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.uHD3840x2160ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -83,17 +86,14 @@ namespace Nikse.SubtitleEdit.Forms
             this.x272ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.labelPleaseWait = new System.Windows.Forms.Label();
             this.checkBoxDeleteInputVideoAfterGeneration = new System.Windows.Forms.CheckBox();
-            this.contextMenuStripMain = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.setSuffixToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.textBoxInputFileName = new Nikse.SubtitleEdit.Controls.NikseTextBox();
             this.textBoxLog = new Nikse.SubtitleEdit.Controls.NikseTextBox();
             this.contextMenuStripMain2 = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.toolStripMenuItemSuffix2 = new System.Windows.Forms.ToolStripMenuItem();
             this.contextMenuStripGenerate.SuspendLayout();
             this.groupBoxSettings.SuspendLayout();
+            this.contextMenuStripMain.SuspendLayout();
             this.contextMenuSubtitles.SuspendLayout();
             this.contextMenuStripRes.SuspendLayout();
-            this.contextMenuStripMain.SuspendLayout();
             this.contextMenuStripMain2.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -172,6 +172,20 @@ namespace Nikse.SubtitleEdit.Forms
             this.groupBoxSettings.TabIndex = 0;
             this.groupBoxSettings.TabStop = false;
             // 
+            // contextMenuStripMain
+            // 
+            this.contextMenuStripMain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.setSuffixToolStripMenuItem});
+            this.contextMenuStripMain.Name = "contextMenuStripMain";
+            this.contextMenuStripMain.Size = new System.Drawing.Size(132, 26);
+            // 
+            // setSuffixToolStripMenuItem
+            // 
+            this.setSuffixToolStripMenuItem.Name = "setSuffixToolStripMenuItem";
+            this.setSuffixToolStripMenuItem.Size = new System.Drawing.Size(131, 22);
+            this.setSuffixToolStripMenuItem.Text = "Set suffix...";
+            this.setSuffixToolStripMenuItem.Click += new System.EventHandler(this.setSuffixToolStripMenuItem_Click);
+            // 
             // labelNotSupported
             // 
             this.labelNotSupported.AutoSize = true;
@@ -441,6 +455,17 @@ namespace Nikse.SubtitleEdit.Forms
             this.buttonOpenVideoFile.UseVisualStyleBackColor = true;
             this.buttonOpenVideoFile.Click += new System.EventHandler(this.buttonOpenVideoFile_Click);
             // 
+            // textBoxInputFileName
+            // 
+            this.textBoxInputFileName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.textBoxInputFileName.FocusedColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(120)))), ((int)(((byte)(215)))));
+            this.textBoxInputFileName.Location = new System.Drawing.Point(22, 44);
+            this.textBoxInputFileName.Name = "textBoxInputFileName";
+            this.textBoxInputFileName.ReadOnly = true;
+            this.textBoxInputFileName.Size = new System.Drawing.Size(860, 20);
+            this.textBoxInputFileName.TabIndex = 16;
+            // 
             // contextMenuStripRes
             // 
             this.contextMenuStripRes.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -565,31 +590,6 @@ namespace Nikse.SubtitleEdit.Forms
             this.checkBoxDeleteInputVideoAfterGeneration.Text = "Delete input video file after \"Generate\"";
             this.checkBoxDeleteInputVideoAfterGeneration.UseVisualStyleBackColor = true;
             // 
-            // contextMenuStripMain
-            // 
-            this.contextMenuStripMain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.setSuffixToolStripMenuItem});
-            this.contextMenuStripMain.Name = "contextMenuStripMain";
-            this.contextMenuStripMain.Size = new System.Drawing.Size(132, 26);
-            // 
-            // setSuffixToolStripMenuItem
-            // 
-            this.setSuffixToolStripMenuItem.Name = "setSuffixToolStripMenuItem";
-            this.setSuffixToolStripMenuItem.Size = new System.Drawing.Size(131, 22);
-            this.setSuffixToolStripMenuItem.Text = "Set suffix...";
-            this.setSuffixToolStripMenuItem.Click += new System.EventHandler(this.setSuffixToolStripMenuItem_Click);
-            // 
-            // textBoxInputFileName
-            // 
-            this.textBoxInputFileName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.textBoxInputFileName.FocusedColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(120)))), ((int)(((byte)(215)))));
-            this.textBoxInputFileName.Location = new System.Drawing.Point(22, 44);
-            this.textBoxInputFileName.Name = "textBoxInputFileName";
-            this.textBoxInputFileName.ReadOnly = true;
-            this.textBoxInputFileName.Size = new System.Drawing.Size(860, 20);
-            this.textBoxInputFileName.TabIndex = 16;
-            // 
             // textBoxLog
             // 
             this.textBoxLog.FocusedColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(120)))), ((int)(((byte)(215)))));
@@ -605,12 +605,12 @@ namespace Nikse.SubtitleEdit.Forms
             this.contextMenuStripMain2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolStripMenuItemSuffix2});
             this.contextMenuStripMain2.Name = "contextMenuStripMain";
-            this.contextMenuStripMain2.Size = new System.Drawing.Size(181, 48);
+            this.contextMenuStripMain2.Size = new System.Drawing.Size(132, 26);
             // 
             // toolStripMenuItemSuffix2
             // 
             this.toolStripMenuItemSuffix2.Name = "toolStripMenuItemSuffix2";
-            this.toolStripMenuItemSuffix2.Size = new System.Drawing.Size(180, 22);
+            this.toolStripMenuItemSuffix2.Size = new System.Drawing.Size(131, 22);
             this.toolStripMenuItemSuffix2.Text = "Set suffix...";
             this.toolStripMenuItemSuffix2.Click += new System.EventHandler(this.setSuffixToolStripMenuItem_Click);
             // 
@@ -619,6 +619,7 @@ namespace Nikse.SubtitleEdit.Forms
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(960, 476);
+            this.ContextMenuStrip = this.contextMenuStripMain2;
             this.Controls.Add(this.checkBoxDeleteInputVideoAfterGeneration);
             this.Controls.Add(this.labelPleaseWait);
             this.Controls.Add(this.groupBoxSettings);
@@ -639,9 +640,9 @@ namespace Nikse.SubtitleEdit.Forms
             this.contextMenuStripGenerate.ResumeLayout(false);
             this.groupBoxSettings.ResumeLayout(false);
             this.groupBoxSettings.PerformLayout();
+            this.contextMenuStripMain.ResumeLayout(false);
             this.contextMenuSubtitles.ResumeLayout(false);
             this.contextMenuStripRes.ResumeLayout(false);
-            this.contextMenuStripMain.ResumeLayout(false);
             this.contextMenuStripMain2.ResumeLayout(false);
             this.ResumeLayout(false);
             this.PerformLayout();
diff --git a/src/ui/Forms/GenerateVideoWithSoftSubs.cs b/src/ui/Forms/GenerateVideoWithSoftSubs.cs
index db3f4a2a2..d73cb79f5 100644
--- a/src/ui/Forms/GenerateVideoWithSoftSubs.cs
+++ b/src/ui/Forms/GenerateVideoWithSoftSubs.cs
@@ -296,13 +296,14 @@ namespace Nikse.SubtitleEdit.Forms
                 {
                     Name = Path.GetFileName(fileName),
                     Language = GetLanguageFromFileName(fileName),
-                    Format = "Blu-ray sup",
+                    Format = "S_HDMV/PGS",
                     SubtitleFormat = null,
                     IsNew = true,
                     IsForced = false,
                     IsDefault = false,
                     FileName = fileName,
                 });
+
                 return;
             }
 
diff --git a/src/ui/Logic/LanguageDeserializer.cs b/src/ui/Logic/LanguageDeserializer.cs
index de6dab80e..6f06134d7 100644
--- a/src/ui/Logic/LanguageDeserializer.cs
+++ b/src/ui/Logic/LanguageDeserializer.cs
@@ -2704,6 +2704,9 @@ namespace Nikse.SubtitleEdit.Logic
                 case "GenerateVideoWithEmbeddedSubs/SetLanguage":
                     language.GenerateVideoWithEmbeddedSubs.SetLanguage = reader.Value;
                     break;
+                case "GenerateVideoWithEmbeddedSubs/LanguageAndTitle":
+                    language.GenerateVideoWithEmbeddedSubs.LanguageAndTitle = reader.Value;
+                    break;
                 case "GenerateVideoWithEmbeddedSubs/ToggleForced":
                     language.GenerateVideoWithEmbeddedSubs.ToggleForced = reader.Value;
                     break;