diff --git a/LanguageMaster.xml b/LanguageMaster.xml
index c6e4082bc..08e316171 100644
--- a/LanguageMaster.xml
+++ b/LanguageMaster.xml
@@ -1922,8 +1922,6 @@ can edit in same subtitle file (collaboration)</Information>
     <SpellCheck>Spell check</SpellCheck>
     <NetflixQualityCheck>Netflix quality check</NetflixQualityCheck>
     <SettingsName>Settings</SettingsName>
-    <Help>Help</Help>
-    <UnbreakNoSpace>Unbreak without space (CJK)</UnbreakNoSpace>
     <ToggleBookmarks>Toggle bookmarks</ToggleBookmarks>
     <ToggleBookmarksWithComment>Toggle bookmarks - add comment</ToggleBookmarksWithComment>
     <ClearBookmarks>Clear bookmarks</ClearBookmarks>
@@ -1933,6 +1931,7 @@ can edit in same subtitle file (collaboration)</Information>
     <ChooseProfile>Choose profile</ChooseProfile>
     <DuplicateLine>Duplicate line</DuplicateLine>
     <ToggleView>Toggle list/source view</ToggleView>
+    <Help>Help</Help>
     <FontInUi>UI Font</FontInUi>
     <ShowFrameRate>Show frame rate in toolbar</ShowFrameRate>
     <DefaultFrameRate>Default frame rate</DefaultFrameRate>
@@ -2293,6 +2292,7 @@ can edit in same subtitle file (collaboration)</Information>
     <MainTextBoxAutoBreakFromPos>Break at first space from cursor position</MainTextBoxAutoBreakFromPos>
     <MainTextBoxAutoBreakFromPosAndGoToNext>Break at first space from cursor position and go to next</MainTextBoxAutoBreakFromPosAndGoToNext>
     <MainTextBoxUnbreak>Unbreak text</MainTextBoxUnbreak>
+    <MainTextBoxUnbreakNoSpace>Unbreak without space (CJK)</MainTextBoxUnbreakNoSpace>
     <MainFileSaveAll>Save all</MainFileSaveAll>
     <Miscellaneous>Misc.</Miscellaneous>
     <CpsIncludesSpace>Chars/sec (CPS) includes spaces</CpsIncludesSpace>
diff --git a/src/libse/Common/Settings.cs b/src/libse/Common/Settings.cs
index 7e24a99aa..7d9e4caa5 100644
--- a/src/libse/Common/Settings.cs
+++ b/src/libse/Common/Settings.cs
@@ -1783,17 +1783,16 @@ $HorzAlign          =   Center
         public string GeneralGoToNextSubtitleAndPlay { get; set; }
         public string GeneralAutoCalcCurrentDuration { get; set; }
         public string GeneralPlayFirstSelected { get; set; }
-        public string GeneralHelp { get; set; }
-        public string GeneralUnbrekNoSpace { get; set; }
         public string GeneralToggleBookmarks { get; set; }
         public string GeneralToggleBookmarksWithText { get; set; }
         public string GeneralClearBookmarks { get; set; }
         public string GeneralGoToBookmark { get; set; }
         public string GeneralGoToPreviousBookmark { get; set; }
         public string GeneralGoToNextBookmark { get; set; }
-        public string ChooseProfile { get; set; }
-        public string DuplicateLine { get; set; }
-        public string ToggleView { get; set; }
+        public string GeneralChooseProfile { get; set; }
+        public string GeneralDuplicateLine { get; set; }
+        public string GeneralToggleView { get; set; }
+        public string GeneralHelp { get; set; }
         public string MainFileNew { get; set; }
         public string MainFileOpen { get; set; }
         public string MainFileOpenKeepVideo { get; set; }
@@ -1989,6 +1988,7 @@ $HorzAlign          =   Center
         public string MainTextBoxBreakAtPosition { get; set; }
         public string MainTextBoxBreakAtPositionAndGoToNext { get; set; }
         public string MainTextBoxUnbreak { get; set; }
+        public string MainTextBoxUnbreakNoSpace { get; set; }
         public string MainWaveformInsertAtCurrentPosition { get; set; }
         public string MainInsertBefore { get; set; }
         public string MainMergeDialog { get; set; }
@@ -2031,6 +2031,7 @@ $HorzAlign          =   Center
             GeneralMergeOriginalAndTranslation = "Control+Alt+Shift+M";
             GeneralGoToNextSubtitle = "Shift+Return";
             GeneralToggleBookmarksWithText = "Control+Shift+B";
+            GeneralHelp = "F1";
             MainFileNew = "Control+N";
             MainFileOpen = "Control+O";
             MainFileSave = "Control+S";
@@ -2085,17 +2086,16 @@ $HorzAlign          =   Center
             MainWaveformInsertAtCurrentPosition = "Insert";
             MainInsertBefore = "Control+Shift+Insert";
             MainTextBoxAutoBreak = "Control+R";
+            MainTranslateGoogleTranslate = "Control+Shift+G";
+            MainAdjustExtendToNextSubtitle = "Control+Shift+E";
+            MainAdjustExtendToPreviousSubtitle = "Alt+Shift+E";
             WaveformVerticalZoom = "Shift+Add";
             WaveformVerticalZoomOut = "Shift+Subtract";
-            GeneralHelp = "F1";
             WaveformAddTextHere = "Return";
             Waveform100MsLeft = "Shift+Left";
             Waveform100MsRight = "Shift+Right";
             Waveform1000MsLeft = "Left";
             Waveform1000MsRight = "Right";
-            MainTranslateGoogleTranslate = "Control+Shift+G";
-            MainAdjustExtendToNextSubtitle = "Control+Shift+E";
-            MainAdjustExtendToPreviousSubtitle = "Alt+Shift+E";
         }
 
         public Shortcuts Clone()
@@ -6066,23 +6066,25 @@ $HorzAlign          =   Center
             if (profileCount == 0)
             {
                 settings.General.CurrentProfile = "Default";
-                settings.General.Profiles = new List<RulesProfile>();
-                settings.General.Profiles.Add(new RulesProfile
+                settings.General.Profiles = new List<RulesProfile>
                 {
-                    Name = settings.General.CurrentProfile,
-                    SubtitleLineMaximumLength = settings.General.SubtitleLineMaximumLength,
-                    MaxNumberOfLines = settings.General.MaxNumberOfLines,
-                    MergeLinesShorterThan = settings.General.MergeLinesShorterThan,
-                    SubtitleMaximumCharactersPerSeconds = (decimal)settings.General.SubtitleMaximumCharactersPerSeconds,
-                    SubtitleOptimalCharactersPerSeconds = (decimal)settings.General.SubtitleOptimalCharactersPerSeconds,
-                    SubtitleMaximumDisplayMilliseconds = settings.General.SubtitleMaximumDisplayMilliseconds,
-                    SubtitleMinimumDisplayMilliseconds = settings.General.SubtitleMinimumDisplayMilliseconds,
-                    SubtitleMaximumWordsPerMinute = (decimal)settings.General.SubtitleMaximumWordsPerMinute,
-                    CpsIncludesSpace = !settings.General.CharactersPerSecondsIgnoreWhiteSpace,
-                    MinimumMillisecondsBetweenLines = settings.General.MinimumMillisecondsBetweenLines,
-                    DialogStyle = settings.General.DialogStyle,
-                    ContinuationStyle = settings.General.ContinuationStyle
-                });
+                    new RulesProfile
+                    {
+                        Name = settings.General.CurrentProfile,
+                        SubtitleLineMaximumLength = settings.General.SubtitleLineMaximumLength,
+                        MaxNumberOfLines = settings.General.MaxNumberOfLines,
+                        MergeLinesShorterThan = settings.General.MergeLinesShorterThan,
+                        SubtitleMaximumCharactersPerSeconds = (decimal)settings.General.SubtitleMaximumCharactersPerSeconds,
+                        SubtitleOptimalCharactersPerSeconds = (decimal)settings.General.SubtitleOptimalCharactersPerSeconds,
+                        SubtitleMaximumDisplayMilliseconds = settings.General.SubtitleMaximumDisplayMilliseconds,
+                        SubtitleMinimumDisplayMilliseconds = settings.General.SubtitleMinimumDisplayMilliseconds,
+                        SubtitleMaximumWordsPerMinute = (decimal)settings.General.SubtitleMaximumWordsPerMinute,
+                        CpsIncludesSpace = !settings.General.CharactersPerSecondsIgnoreWhiteSpace,
+                        MinimumMillisecondsBetweenLines = settings.General.MinimumMillisecondsBetweenLines,
+                        DialogStyle = settings.General.DialogStyle,
+                        ContinuationStyle = settings.General.ContinuationStyle
+                    }
+                };
                 GeneralSettings.AddExtraProfiles(settings.General.Profiles);
             }
 
@@ -6240,18 +6242,6 @@ $HorzAlign          =   Center
                     shortcuts.GeneralPlayFirstSelected = subNode.InnerText;
                 }
 
-                subNode = node.SelectSingleNode("GeneralHelp");
-                if (subNode != null)
-                {
-                    shortcuts.GeneralHelp = subNode.InnerText;
-                }
-
-                subNode = node.SelectSingleNode("GeneralUnbrekNoSpace");
-                if (subNode != null)
-                {
-                    shortcuts.GeneralUnbrekNoSpace = subNode.InnerText;
-                }
-
                 subNode = node.SelectSingleNode("GeneralToggleBookmarks");
                 if (subNode != null)
                 {
@@ -6288,22 +6278,28 @@ $HorzAlign          =   Center
                     shortcuts.GeneralGoToNextBookmark = subNode.InnerText;
                 }
 
-                subNode = node.SelectSingleNode("ChooseProfile");
+                subNode = node.SelectSingleNode("GeneralChooseProfile");
                 if (subNode != null)
                 {
-                    shortcuts.ChooseProfile = subNode.InnerText;
+                    shortcuts.GeneralChooseProfile = subNode.InnerText;
                 }
 
-                subNode = node.SelectSingleNode("DuplicateLine");
+                subNode = node.SelectSingleNode("GeneralDuplicateLine");
                 if (subNode != null)
                 {
-                    shortcuts.DuplicateLine = subNode.InnerText;
+                    shortcuts.GeneralDuplicateLine = subNode.InnerText;
                 }
 
-                subNode = node.SelectSingleNode("ToggleView");
+                subNode = node.SelectSingleNode("GeneralToggleView");
                 if (subNode != null)
                 {
-                    shortcuts.ToggleView = subNode.InnerText;
+                    shortcuts.GeneralToggleView = subNode.InnerText;
+                }
+
+                subNode = node.SelectSingleNode("GeneralHelp");
+                if (subNode != null)
+                {
+                    shortcuts.GeneralHelp = subNode.InnerText;
                 }
 
                 subNode = node.SelectSingleNode("MainFileNew");
@@ -7476,6 +7472,12 @@ $HorzAlign          =   Center
                     shortcuts.MainTextBoxUnbreak = subNode.InnerText;
                 }
 
+                subNode = node.SelectSingleNode("MainTextBoxUnbrekNoSpace");
+                if (subNode != null)
+                {
+                    shortcuts.MainTextBoxUnbreakNoSpace = subNode.InnerText;
+                }
+
                 subNode = node.SelectSingleNode("MainWaveformInsertAtCurrentPosition");
                 if (subNode != null)
                 {
@@ -8426,17 +8428,16 @@ $HorzAlign          =   Center
             textWriter.WriteElementString("GeneralGoToNextSubtitleAndPlay", shortcuts.GeneralGoToNextSubtitleAndPlay);
             textWriter.WriteElementString("GeneralAutoCalcCurrentDuration", shortcuts.GeneralAutoCalcCurrentDuration);
             textWriter.WriteElementString("GeneralPlayFirstSelected", shortcuts.GeneralPlayFirstSelected);
-            textWriter.WriteElementString("GeneralHelp", shortcuts.GeneralHelp);
-            textWriter.WriteElementString("GeneralUnbrekNoSpace", shortcuts.GeneralUnbrekNoSpace);
             textWriter.WriteElementString("GeneralToggleBookmarks", shortcuts.GeneralToggleBookmarks);
             textWriter.WriteElementString("GeneralToggleBookmarksWithText", shortcuts.GeneralToggleBookmarksWithText);
             textWriter.WriteElementString("GeneralClearBookmarks", shortcuts.GeneralClearBookmarks);
             textWriter.WriteElementString("GeneralGoToBookmark", shortcuts.GeneralGoToBookmark);
             textWriter.WriteElementString("GeneralGoToNextBookmark", shortcuts.GeneralGoToNextBookmark);
-            textWriter.WriteElementString("ChooseProfile", shortcuts.ChooseProfile);
-            textWriter.WriteElementString("DuplicateLine", shortcuts.DuplicateLine);
-            textWriter.WriteElementString("ToggleView", shortcuts.ToggleView);
             textWriter.WriteElementString("GeneralGoToPreviousBookmark", shortcuts.GeneralGoToPreviousBookmark);
+            textWriter.WriteElementString("GeneralChooseProfile", shortcuts.GeneralChooseProfile);
+            textWriter.WriteElementString("GeneralDuplicateLine", shortcuts.GeneralDuplicateLine);
+            textWriter.WriteElementString("GeneralToggleView", shortcuts.GeneralToggleView);
+            textWriter.WriteElementString("GeneralHelp", shortcuts.GeneralHelp);
             textWriter.WriteElementString("MainFileNew", shortcuts.MainFileNew);
             textWriter.WriteElementString("MainFileOpen", shortcuts.MainFileOpen);
             textWriter.WriteElementString("MainFileOpenKeepVideo", shortcuts.MainFileOpenKeepVideo);
@@ -8631,6 +8632,7 @@ $HorzAlign          =   Center
             textWriter.WriteElementString("MainTextBoxBreakAtPosition", shortcuts.MainTextBoxBreakAtPosition);
             textWriter.WriteElementString("MainTextBoxBreakAtPositionAndGoToNext", shortcuts.MainTextBoxBreakAtPositionAndGoToNext);
             textWriter.WriteElementString("MainTextBoxUnbreak", shortcuts.MainTextBoxUnbreak);
+            textWriter.WriteElementString("MainTextBoxUnbrekNoSpace", shortcuts.MainTextBoxUnbreakNoSpace);
             textWriter.WriteElementString("MainWaveformInsertAtCurrentPosition", shortcuts.MainWaveformInsertAtCurrentPosition);
             textWriter.WriteElementString("MainInsertBefore", shortcuts.MainInsertBefore);
             textWriter.WriteElementString("MainMergeDialog", shortcuts.MainMergeDialog);
diff --git a/src/libse/Language.cs b/src/libse/Language.cs
index 39dbee7f4..6ceb74aa1 100644
--- a/src/libse/Language.cs
+++ b/src/libse/Language.cs
@@ -2230,8 +2230,6 @@ can edit in same subtitle file (collaboration)",
                 SpellCheck = "Spell check",
                 NetflixQualityCheck = "Netflix quality check",
                 SettingsName = "Settings",
-                Help = "Help",
-                UnbreakNoSpace = "Unbreak without space (CJK)",
                 ToggleBookmarks = "Toggle bookmarks",
                 ToggleBookmarksWithComment = "Toggle bookmarks - add comment",
                 ClearBookmarks = "Clear bookmarks",
@@ -2241,6 +2239,7 @@ can edit in same subtitle file (collaboration)",
                 ChooseProfile = "Choose profile",
                 DuplicateLine = "Duplicate line",
                 ToggleView = "Toggle list/source view",
+                Help = "Help",
                 FontInUi = "UI Font",
                 ShowFrameRate = "Show frame rate in toolbar",
                 DefaultFrameRate = "Default frame rate",
@@ -2599,6 +2598,7 @@ can edit in same subtitle file (collaboration)",
                 MainTextBoxAutoBreakFromPos = "Break at first space from cursor position",
                 MainTextBoxAutoBreakFromPosAndGoToNext = "Break at first space from cursor position and go to next",
                 MainTextBoxUnbreak = "Unbreak text",
+                MainTextBoxUnbreakNoSpace = "Unbreak without space (CJK)",
                 MainFileSaveAll = "Save all",
                 Miscellaneous = "Misc.",
                 UseDoNotBreakAfterList = "Use do-not-break-after list",
diff --git a/src/libse/LanguageDeserializer.cs b/src/libse/LanguageDeserializer.cs
index 591ff8066..bfaa6fb11 100644
--- a/src/libse/LanguageDeserializer.cs
+++ b/src/libse/LanguageDeserializer.cs
@@ -5188,12 +5188,6 @@ namespace Nikse.SubtitleEdit.Core
                 case "Settings/SettingsName":
                     language.Settings.SettingsName = reader.Value;
                     break;
-                case "Settings/Help":
-                    language.Settings.Help = reader.Value;
-                    break;
-                case "Settings/UnbreakNoSpace":
-                    language.Settings.UnbreakNoSpace = reader.Value;
-                    break;
                 case "Settings/ToggleBookmarks":
                     language.Settings.ToggleBookmarks = reader.Value;
                     break;
@@ -5221,6 +5215,9 @@ namespace Nikse.SubtitleEdit.Core
                 case "Settings/ToggleView":
                     language.Settings.ToggleView = reader.Value;
                     break;
+                case "Settings/Help":
+                    language.Settings.Help = reader.Value;
+                    break;
                 case "Settings/FontInUi":
                     language.Settings.FontInUi = reader.Value;
                     break;
@@ -6301,6 +6298,9 @@ namespace Nikse.SubtitleEdit.Core
                 case "Settings/MainTextBoxUnbreak":
                     language.Settings.MainTextBoxUnbreak = reader.Value;
                     break;
+                case "Settings/MainTextBoxUnbreakNoSpace":
+                    language.Settings.MainTextBoxUnbreakNoSpace = reader.Value;
+                    break;
                 case "Settings/MainFileSaveAll":
                     language.Settings.MainFileSaveAll = reader.Value;
                     break;
diff --git a/src/libse/LanguageStructure.cs b/src/libse/LanguageStructure.cs
index 04fe519cb..264c3a6ae 100644
--- a/src/libse/LanguageStructure.cs
+++ b/src/libse/LanguageStructure.cs
@@ -2085,8 +2085,6 @@
             public string SpellCheck { get; set; }
             public string NetflixQualityCheck { get; set; }
             public string SettingsName { get; set; }
-            public string Help { get; set; }
-            public string UnbreakNoSpace { get; set; }
             public string ToggleBookmarks { get; set; }
             public string ToggleBookmarksWithComment { get; set; }
             public string ClearBookmarks { get; set; }
@@ -2096,6 +2094,7 @@
             public string ChooseProfile { get; set; }
             public string DuplicateLine { get; set; }
             public string ToggleView { get; set; }
+            public string Help { get; set; }
             public string FontInUi { get; set; }
             public string ShowFrameRate { get; set; }
             public string DefaultFrameRate { get; set; }
@@ -2460,6 +2459,7 @@
             public string MainTextBoxAutoBreakFromPos { get; set; }
             public string MainTextBoxAutoBreakFromPosAndGoToNext { get; set; }
             public string MainTextBoxUnbreak { get; set; }
+            public string MainTextBoxUnbreakNoSpace { get; set; }
             public string MainFileSaveAll { get; set; }
             public string Miscellaneous { get; set; }
             public string CpsIncludesSpace { get; set; }
diff --git a/src/ui/Forms/Main.cs b/src/ui/Forms/Main.cs
index a657bdd7c..07ca96847 100644
--- a/src/ui/Forms/Main.cs
+++ b/src/ui/Forms/Main.cs
@@ -9110,110 +9110,6 @@ namespace Nikse.SubtitleEdit.Forms
             SubtitleListview1.ResumeLayout();
         }
 
-        private void ButtonAutoBreakClick(object sender, EventArgs e)
-        {
-            string language = LanguageAutoDetect.AutoDetectGoogleLanguage(_subtitle);
-            string languageOriginal = string.Empty;
-            if (_subtitleAlternate != null)
-            {
-                languageOriginal = LanguageAutoDetect.AutoDetectGoogleLanguage(_subtitleAlternate);
-            }
-
-            var textCaretPos = textBoxListViewText.SelectionStart;
-
-            if (SubtitleListview1.SelectedItems.Count > 1)
-            {
-                bool historyAdded = false;
-                SubtitleListview1.BeginUpdate();
-                foreach (int index in SubtitleListview1.SelectedIndices)
-                {
-                    var p = _subtitle.GetParagraphOrDefault(index);
-                    if (p != null)
-                    {
-                        var oldText = p.Text;
-                        var newText = Utilities.AutoBreakLine(p.Text, language);
-                        if (oldText != newText)
-                        {
-                            if (!historyAdded)
-                            {
-                                historyAdded = true;
-                                MakeHistoryForUndo(_language.Controls.AutoBreak.RemoveChar('&'));
-                            }
-
-                            p.Text = newText;
-                            SubtitleListview1.SetText(index, p.Text);
-                        }
-
-                        if (_subtitleAlternate != null && SubtitleListview1.IsAlternateTextColumnVisible && Configuration.Settings.General.AllowEditOfOriginalSubtitle)
-                        {
-                            var original = Utilities.GetOriginalParagraph(index, p, _subtitleAlternate.Paragraphs);
-                            if (original != null)
-                            {
-                                oldText = original.Text;
-                                newText = Utilities.AutoBreakLine(original.Text, language);
-                                if (oldText != newText)
-                                {
-                                    if (!historyAdded)
-                                    {
-                                        historyAdded = true;
-                                        MakeHistoryForUndo(_language.Controls.AutoBreak.RemoveChar('&'));
-                                    }
-
-                                    original.Text = newText;
-                                    SubtitleListview1.SetAlternateText(index, original.Text);
-                                }
-                            }
-                        }
-
-                        SubtitleListview1.SyntaxColorLine(_subtitle.Paragraphs, index, p);
-                    }
-                }
-
-                SubtitleListview1.EndUpdate();
-                RefreshSelectedParagraph();
-            }
-            else
-            {
-                var fixedText = Utilities.AutoBreakLine(textBoxListViewText.Text, language);
-                var makeHistory = textBoxListViewText.Text != fixedText;
-                if (_subtitleAlternate != null && Configuration.Settings.General.AllowEditOfOriginalSubtitle)
-                {
-                    var alternateFixedText = Utilities.AutoBreakLine(textBoxListViewTextAlternate.Text, languageOriginal);
-                    if (!makeHistory)
-                    {
-                        makeHistory = textBoxListViewTextAlternate.Text != alternateFixedText;
-                    }
-
-                    if (makeHistory)
-                    {
-                        MakeHistoryForUndo(_language.Controls.AutoBreak.RemoveChar('&'));
-                        textBoxListViewText.Text = fixedText;
-                    }
-
-                    textBoxListViewTextAlternate.Text = alternateFixedText;
-                }
-                else if (makeHistory)
-                {
-                    MakeHistoryForUndo(_language.Controls.AutoBreak.RemoveChar('&'));
-                    textBoxListViewText.Text = fixedText;
-                }
-            }
-
-            var s = textBoxListViewText.Text;
-            var startText = s.Substring(0, Math.Min(textCaretPos, s.Length));
-            var numberOfNewLines = Utilities.CountTagInText(startText, Environment.NewLine);
-            textCaretPos += numberOfNewLines;
-            if (s.Length > textCaretPos && '\n' == s[textCaretPos])
-            {
-                textCaretPos--;
-            }
-
-            if (textCaretPos > 0)
-            {
-                textBoxListViewText.SelectionStart = textCaretPos;
-            }
-        }
-
         private int _lastNumberOfNewLines = -1;
         private int _lastNumberOfNewLinesAlternate = -1;
 
@@ -9410,16 +9306,6 @@ namespace Nikse.SubtitleEdit.Forms
             {
                 e.SuppressKeyPress = true;
             }
-            else if (e.KeyData == _shortcuts.MainTextBoxAutoBreak)
-            {
-                BreakUnbreakTextBox(false, textBoxListViewText);
-                e.SuppressKeyPress = true;
-            }
-            else if (e.KeyData == _shortcuts.MainTextBoxUnbreak)
-            {
-                BreakUnbreakTextBox(true, textBoxListViewText);
-                e.SuppressKeyPress = true;
-            }
             else if (e.KeyData == _shortcuts.MainTextBoxBreakAtCursorPosition)
             {
                 var text = Utilities.ReSplit(textBoxListViewText.Text, textBoxListViewText.SelectionStart);
@@ -11502,12 +11388,7 @@ namespace Nikse.SubtitleEdit.Forms
             }
         }
 
-        private void ButtonUnBreakClick(object sender, EventArgs e)
-        {
-            Unbreak();
-        }
-
-        private void BreakUnbreakTextBox(bool unbreak, SETextBox tb)
+        private void BreakUnbreakTextBox(bool unbreak, SETextBox tb, bool removeNewLineOnly = false)
         {
             var textCaretPos = tb.SelectionStart;
             var startText = tb.Text.Substring(0, textCaretPos);
@@ -11515,7 +11396,14 @@ namespace Nikse.SubtitleEdit.Forms
             if (unbreak)
             {
                 textCaretPos -= numberOfNewLines;
-                tb.Text = Utilities.UnbreakLine(tb.Text);
+                if (removeNewLineOnly)
+                {
+                    tb.Text = tb.Text.Replace(Environment.NewLine, string.Empty);
+                }
+                else
+                {
+                    tb.Text = Utilities.UnbreakLine(tb.Text);
+                }
             }
             else
             {
@@ -11561,6 +11449,11 @@ namespace Nikse.SubtitleEdit.Forms
             tb.SelectionStart = textCaretPos;
         }
 
+        private void ButtonUnBreakClick(object sender, EventArgs e)
+        {
+            Unbreak();
+        }
+
         private void Unbreak(bool removeNewLineOnly = false)
         {
             _doAutoBreakOnTextChanged = false;
@@ -11640,7 +11533,7 @@ namespace Nikse.SubtitleEdit.Forms
                 var makeHistory = textBoxListViewText.Text != fixedText;
                 if (_subtitleAlternate != null && Configuration.Settings.General.AllowEditOfOriginalSubtitle)
                 {
-                    var alternateFixedText = Utilities.UnbreakLine(textBoxListViewTextAlternate.Text);
+                    var alternateFixedText = removeNewLineOnly ? textBoxListViewText.Text.Replace(Environment.NewLine, string.Empty) : Utilities.UnbreakLine(textBoxListViewTextAlternate.Text);
                     if (!makeHistory)
                     {
                         makeHistory = textBoxListViewTextAlternate.Text != alternateFixedText;
@@ -11665,6 +11558,115 @@ namespace Nikse.SubtitleEdit.Forms
             textBoxListViewText.SelectionStart = textCaretPos;
         }
 
+        private void ButtonAutoBreakClick(object sender, EventArgs e)
+        {
+            AutoBreak();
+        }
+
+        private void AutoBreak()
+        {
+            string language = LanguageAutoDetect.AutoDetectGoogleLanguage(_subtitle);
+            string languageOriginal = string.Empty;
+            if (_subtitleAlternate != null)
+            {
+                languageOriginal = LanguageAutoDetect.AutoDetectGoogleLanguage(_subtitleAlternate);
+            }
+
+            var textCaretPos = textBoxListViewText.SelectionStart;
+
+            if (SubtitleListview1.SelectedItems.Count > 1)
+            {
+                bool historyAdded = false;
+                SubtitleListview1.BeginUpdate();
+                foreach (int index in SubtitleListview1.SelectedIndices)
+                {
+                    var p = _subtitle.GetParagraphOrDefault(index);
+                    if (p != null)
+                    {
+                        var oldText = p.Text;
+                        var newText = Utilities.AutoBreakLine(p.Text, language);
+                        if (oldText != newText)
+                        {
+                            if (!historyAdded)
+                            {
+                                historyAdded = true;
+                                MakeHistoryForUndo(_language.Controls.AutoBreak.RemoveChar('&'));
+                            }
+
+                            p.Text = newText;
+                            SubtitleListview1.SetText(index, p.Text);
+                        }
+
+                        if (_subtitleAlternate != null && SubtitleListview1.IsAlternateTextColumnVisible && Configuration.Settings.General.AllowEditOfOriginalSubtitle)
+                        {
+                            var original = Utilities.GetOriginalParagraph(index, p, _subtitleAlternate.Paragraphs);
+                            if (original != null)
+                            {
+                                oldText = original.Text;
+                                newText = Utilities.AutoBreakLine(original.Text, language);
+                                if (oldText != newText)
+                                {
+                                    if (!historyAdded)
+                                    {
+                                        historyAdded = true;
+                                        MakeHistoryForUndo(_language.Controls.AutoBreak.RemoveChar('&'));
+                                    }
+
+                                    original.Text = newText;
+                                    SubtitleListview1.SetAlternateText(index, original.Text);
+                                }
+                            }
+                        }
+
+                        SubtitleListview1.SyntaxColorLine(_subtitle.Paragraphs, index, p);
+                    }
+                }
+
+                SubtitleListview1.EndUpdate();
+                RefreshSelectedParagraph();
+            }
+            else
+            {
+                var fixedText = Utilities.AutoBreakLine(textBoxListViewText.Text, language);
+                var makeHistory = textBoxListViewText.Text != fixedText;
+                if (_subtitleAlternate != null && Configuration.Settings.General.AllowEditOfOriginalSubtitle)
+                {
+                    var alternateFixedText = Utilities.AutoBreakLine(textBoxListViewTextAlternate.Text, languageOriginal);
+                    if (!makeHistory)
+                    {
+                        makeHistory = textBoxListViewTextAlternate.Text != alternateFixedText;
+                    }
+
+                    if (makeHistory)
+                    {
+                        MakeHistoryForUndo(_language.Controls.AutoBreak.RemoveChar('&'));
+                        textBoxListViewText.Text = fixedText;
+                    }
+
+                    textBoxListViewTextAlternate.Text = alternateFixedText;
+                }
+                else if (makeHistory)
+                {
+                    MakeHistoryForUndo(_language.Controls.AutoBreak.RemoveChar('&'));
+                    textBoxListViewText.Text = fixedText;
+                }
+            }
+
+            var s = textBoxListViewText.Text;
+            var startText = s.Substring(0, Math.Min(textCaretPos, s.Length));
+            var numberOfNewLines = Utilities.CountTagInText(startText, Environment.NewLine);
+            textCaretPos += numberOfNewLines;
+            if (s.Length > textCaretPos && '\n' == s[textCaretPos])
+            {
+                textCaretPos--;
+            }
+
+            if (textCaretPos > 0)
+            {
+                textBoxListViewText.SelectionStart = textCaretPos;
+            }
+        }
+
         private void TabControlSubtitleSelectedIndexChanged(object sender, EventArgs e)
         {
             var format = GetCurrentSubtitleFormat();
@@ -14038,6 +14040,7 @@ namespace Nikse.SubtitleEdit.Forms
                 {
                     ToggleDashes();
                 }
+
                 e.SuppressKeyPress = true;
             }
             else if (!toolStripMenuItemRtlUnicodeControlChars.Visible && _shortcuts.MainEditFixRTLViaUnicodeChars == e.KeyData && inListView)
@@ -14210,9 +14213,55 @@ namespace Nikse.SubtitleEdit.Forms
                     e.SuppressKeyPress = true;
                 }
             }
-            else if (_shortcuts.MainUnbreakNoSpace == e.KeyData)
+            else if (_shortcuts.MainTextBoxAutoBreak == e.KeyData && inListView)
             {
-                Unbreak(true);
+                if (textBoxListViewText.Focused)
+                {
+                    BreakUnbreakTextBox(false, textBoxListViewText);
+                }
+                else if (textBoxListViewTextAlternate.Focused)
+                {
+                    BreakUnbreakTextBox(false, textBoxListViewTextAlternate);
+                }
+                else
+                {
+                    AutoBreak();
+                }
+
+                e.SuppressKeyPress = true;
+            }
+            else if (_shortcuts.MainTextBoxUnbreak == e.KeyData && inListView)
+            {
+                if (textBoxListViewText.Focused)
+                {
+                    BreakUnbreakTextBox(true, textBoxListViewText);
+                }
+                else if (textBoxListViewTextAlternate.Focused)
+                {
+                    BreakUnbreakTextBox(true, textBoxListViewTextAlternate);
+                }
+                else
+                {
+                    Unbreak();
+                }
+
+                e.SuppressKeyPress = true;
+            }
+            else if (_shortcuts.MainTextBoxUnbreakNoSpace == e.KeyData && inListView)
+            {
+                if (textBoxListViewText.Focused)
+                {
+                    BreakUnbreakTextBox(true, textBoxListViewText, true);
+                }
+                else if (textBoxListViewTextAlternate.Focused)
+                {
+                    BreakUnbreakTextBox(true, textBoxListViewTextAlternate, true);
+                }
+                else
+                {
+                    Unbreak(true);
+                }
+
                 e.SuppressKeyPress = true;
             }
             else if (_shortcuts.MainGeneralToggleBookmarks == e.KeyData)
@@ -24053,16 +24102,6 @@ namespace Nikse.SubtitleEdit.Forms
             {
                 e.SuppressKeyPress = true;
             }
-            else if (e.KeyData == _shortcuts.MainTextBoxAutoBreak)
-            {
-                BreakUnbreakTextBox(false, textBoxListViewTextAlternate);
-                e.SuppressKeyPress = true;
-            }
-            else if (e.KeyData == _shortcuts.MainTextBoxUnbreak)
-            {
-                BreakUnbreakTextBox(true, textBoxListViewTextAlternate);
-                e.SuppressKeyPress = true;
-            }
             else if (e.KeyData == _shortcuts.MainTextBoxBreakAtCursorPosition)
             {
                 textBoxListViewTextAlternate.Text = Utilities.ReSplit(textBoxListViewTextAlternate.Text, textBoxListViewTextAlternate.SelectionStart);
diff --git a/src/ui/Forms/Settings.cs b/src/ui/Forms/Settings.cs
index a6faf8e51..687d9df40 100644
--- a/src/ui/Forms/Settings.cs
+++ b/src/ui/Forms/Settings.cs
@@ -1122,17 +1122,16 @@ namespace Nikse.SubtitleEdit.Forms
             AddNode(generalNode, language.GoToNextSubtitleAndFocusVideo, nameof(Configuration.Settings.Shortcuts.GeneralGoToNextSubtitleAndFocusVideo));
             AddNode(generalNode, language.GoToPrevSubtitleAndPlay, nameof(Configuration.Settings.Shortcuts.GeneralGoToPrevSubtitleAndPlay));
             AddNode(generalNode, language.GoToNextSubtitleAndPlay, nameof(Configuration.Settings.Shortcuts.GeneralGoToNextSubtitleAndPlay));
-            AddNode(generalNode, language.Help, nameof(Configuration.Settings.Shortcuts.GeneralHelp), true);
-            AddNode(generalNode, language.UnbreakNoSpace, nameof(Configuration.Settings.Shortcuts.GeneralUnbrekNoSpace));
             AddNode(generalNode, language.ToggleBookmarks, nameof(Configuration.Settings.Shortcuts.GeneralToggleBookmarks));
             AddNode(generalNode, language.ToggleBookmarksWithComment, nameof(Configuration.Settings.Shortcuts.GeneralToggleBookmarksWithText), true);
             AddNode(generalNode, language.ClearBookmarks, nameof(Configuration.Settings.Shortcuts.GeneralClearBookmarks));
             AddNode(generalNode, language.GoToBookmark, nameof(Configuration.Settings.Shortcuts.GeneralGoToBookmark));
             AddNode(generalNode, language.GoToPreviousBookmark, nameof(Configuration.Settings.Shortcuts.GeneralGoToPreviousBookmark));
             AddNode(generalNode, language.GoToNextBookmark, nameof(Configuration.Settings.Shortcuts.GeneralGoToNextBookmark));
-            AddNode(generalNode, language.ChooseProfile, nameof(Configuration.Settings.Shortcuts.ChooseProfile));
-            AddNode(generalNode, language.DuplicateLine, nameof(Configuration.Settings.Shortcuts.DuplicateLine));
-            AddNode(generalNode, language.ToggleView, nameof(Configuration.Settings.Shortcuts.ToggleView));
+            AddNode(generalNode, language.ChooseProfile, nameof(Configuration.Settings.Shortcuts.GeneralChooseProfile));
+            AddNode(generalNode, language.DuplicateLine, nameof(Configuration.Settings.Shortcuts.GeneralDuplicateLine));
+            AddNode(generalNode, language.ToggleView, nameof(Configuration.Settings.Shortcuts.GeneralToggleView));
+            AddNode(generalNode, language.Help, nameof(Configuration.Settings.Shortcuts.GeneralHelp), true);
             if (generalNode.Nodes.Count > 0)
             {
                 _shortcuts.Nodes.Add(generalNode);
@@ -1335,6 +1334,7 @@ namespace Nikse.SubtitleEdit.Forms
             AddNode(textBoxNode, language.MainTextBoxAutoBreakFromPos, nameof(Configuration.Settings.Shortcuts.MainTextBoxBreakAtPosition));
             AddNode(textBoxNode, language.MainTextBoxAutoBreakFromPosAndGoToNext, nameof(Configuration.Settings.Shortcuts.MainTextBoxBreakAtPositionAndGoToNext));
             AddNode(textBoxNode, language.MainTextBoxUnbreak, nameof(Configuration.Settings.Shortcuts.MainTextBoxUnbreak));
+            AddNode(textBoxNode, language.MainTextBoxUnbreakNoSpace, nameof(Configuration.Settings.Shortcuts.MainTextBoxUnbreakNoSpace));
             if (textBoxNode.Nodes.Count > 0)
             {
                 _shortcuts.Nodes.Add(textBoxNode);
diff --git a/src/ui/Languages/bg-BG.xml b/src/ui/Languages/bg-BG.xml
index ab74577b6..420d28756 100644
--- a/src/ui/Languages/bg-BG.xml
+++ b/src/ui/Languages/bg-BG.xml
@@ -1933,8 +1933,8 @@ Email: mailto:nikse.dk@gmail.com</AboutText1>
     <GoToBookmark>Преминаване на отметка</GoToBookmark>
     <GoToPreviousBookmark>Преминаване на предишната отметка</GoToPreviousBookmark>
     <GoToNextBookmark>Преминаване до следващата отметка</GoToNextBookmark>
-    <ChooseProfile>Избор на профил</ChooseProfile>
-    <DuplicateLine>Дублиран ред</DuplicateLine>
+    <GeneralChooseProfile>Избор на профил</GeneralChooseProfile>
+    <GeneralDuplicateLine>Дублиран ред</GeneralDuplicateLine>
     <FontInUi>Шрифт на потребителския интерфейс</FontInUi>
     <ShowFrameRate>Показване честотата на кадрите в лентата с инструменти</ShowFrameRate>
     <DefaultFrameRate>Честота на кадрите (fps) по подр.</DefaultFrameRate>
diff --git a/src/ui/Languages/ca-ES.xml b/src/ui/Languages/ca-ES.xml
index 10079f493..17f0fd9ba 100644
--- a/src/ui/Languages/ca-ES.xml
+++ b/src/ui/Languages/ca-ES.xml
@@ -1743,7 +1743,7 @@ Email: mailto:nikse.dk@gmail.com</AboutText1>
     <GoToBookmark>Vés a marcador</GoToBookmark>
     <GoToPreviousBookmark>Vés a l'anterior marcador</GoToPreviousBookmark>
     <GoToNextBookmark>Vés al següent marcador</GoToNextBookmark>
-    <ChooseProfile>Escolliu perfil</ChooseProfile>
+    <GeneralChooseProfile>Escolliu perfil</GeneralChooseProfile>
     <FontInUi>Font UI</FontInUi>
     <ShowFrameRate>Mostra ràtio quadres en barra d'eines</ShowFrameRate>
     <DefaultFrameRate>Ràtio quadres predeterminada</DefaultFrameRate>
diff --git a/src/ui/Languages/da-DK.xml b/src/ui/Languages/da-DK.xml
index d047fce9f..b4099ceaf 100644
--- a/src/ui/Languages/da-DK.xml
+++ b/src/ui/Languages/da-DK.xml
@@ -1916,8 +1916,8 @@ kan redigere i samme undertekst fil (fælles online projekt)</Information>
     <GoToBookmark>Gå til bogmærke</GoToBookmark>
     <GoToPreviousBookmark>Gå til tidligere bogmærke</GoToPreviousBookmark>
     <GoToNextBookmark>Gå til næste bogmærke</GoToNextBookmark>
-    <ChooseProfile>Vælg profil</ChooseProfile>
-    <DuplicateLine>Dupliker linje</DuplicateLine>
+    <GeneralChooseProfile>Vælg profil</GeneralChooseProfile>
+    <GeneralDuplicateLine>Dupliker linje</GeneralDuplicateLine>
     <FontInUi>UI-skrifttype</FontInUi>
     <ShowFrameRate>Vis frame rate i værktøjslinjen</ShowFrameRate>
     <DefaultFrameRate>Standard frame rate</DefaultFrameRate>
diff --git a/src/ui/Languages/de-DE.xml b/src/ui/Languages/de-DE.xml
index bed014b44..fe4a75c69 100644
--- a/src/ui/Languages/de-DE.xml
+++ b/src/ui/Languages/de-DE.xml
@@ -1769,7 +1769,7 @@ gleiche Untertiteldatei bearbeiten können (Zusammenarbeit)</Information>
     <GoToBookmark>Zum Lesezeichen</GoToBookmark>
     <GoToPreviousBookmark>Vorheriges Lesezeichen</GoToPreviousBookmark>
     <GoToNextBookmark>Nächstes Lesezeichen</GoToNextBookmark>
-    <ChooseProfile>Profil wählen</ChooseProfile>
+    <GeneralChooseProfile>Profil wählen</GeneralChooseProfile>
     <FontInUi>Benutzeroberfläche Schriftart</FontInUi>
     <ShowFrameRate>Bildfrequenz in Symbolleiste anzeigen</ShowFrameRate>
     <DefaultFrameRate>Standard Bildfrequenz</DefaultFrameRate>
diff --git a/src/ui/Languages/el-GR.xml b/src/ui/Languages/el-GR.xml
index a6c984533..438acfcf7 100644
--- a/src/ui/Languages/el-GR.xml
+++ b/src/ui/Languages/el-GR.xml
@@ -1918,8 +1918,8 @@ Email: mailto:nikse.dk@gmail.com</AboutText1>
     <GoToBookmark>Μετάβαση σε σημείωση</GoToBookmark>
     <GoToPreviousBookmark>Προηγούμενη σημείωση</GoToPreviousBookmark>
     <GoToNextBookmark>Επόμενη σημείωση</GoToNextBookmark>
-    <ChooseProfile>Επιλογή προφίλ</ChooseProfile>
-    <DuplicateLine>Αντιγραφή γραμμής</DuplicateLine>
+    <GeneralChooseProfile>Επιλογή προφίλ</GeneralChooseProfile>
+    <GeneralDuplicateLine>Αντιγραφή γραμμής</GeneralDuplicateLine>
     <FontInUi>Γραμματοσειρά διεπαφής</FontInUi>
     <ShowFrameRate>Εμφάνιση ρυθμού καρέ στη γραμμή εργαλείων</ShowFrameRate>
     <DefaultFrameRate>Προεπιλεγμένος ρυθμός καρέ</DefaultFrameRate>
diff --git a/src/ui/Languages/es-AR.xml b/src/ui/Languages/es-AR.xml
index 3a3f1a5f3..d14535745 100644
--- a/src/ui/Languages/es-AR.xml
+++ b/src/ui/Languages/es-AR.xml
@@ -1777,8 +1777,8 @@ puede editar el mismo archivo de subtítulo (colaboración)</Information>
     <GoToBookmark>Ir al marcador</GoToBookmark>
     <GoToPreviousBookmark>Ir al marcador anterior</GoToPreviousBookmark>
     <GoToNextBookmark>Ir al siguiente marcador</GoToNextBookmark>
-    <ChooseProfile>Elegir perfil</ChooseProfile>
-    <DuplicateLine>Duplicar línea</DuplicateLine>
+    <GeneralChooseProfile>Elegir perfil</GeneralChooseProfile>
+    <GeneralDuplicateLine>Duplicar línea</GeneralDuplicateLine>
     <FontInUi>Interfaz de la Fuente</FontInUi>
     <ShowFrameRate>Mostrar tasa de cuadros en barra herramientas</ShowFrameRate>
     <DefaultFrameRate>Tasa de cuadros por defecto</DefaultFrameRate>
diff --git a/src/ui/Languages/es-ES.xml b/src/ui/Languages/es-ES.xml
index 83b3cb0b8..774b5758f 100644
--- a/src/ui/Languages/es-ES.xml
+++ b/src/ui/Languages/es-ES.xml
@@ -1778,8 +1778,8 @@ puede editar el mismo archivo de subtítulo (colaboración)</Information>
     <GoToBookmark>Ir al marcador</GoToBookmark>
     <GoToPreviousBookmark>Ir al marcador anterior</GoToPreviousBookmark>
     <GoToNextBookmark>Ir al siguiente marcador</GoToNextBookmark>
-    <ChooseProfile>Elegir perfil</ChooseProfile>
-    <DuplicateLine>Duplicar línea</DuplicateLine>
+    <GeneralChooseProfile>Elegir perfil</GeneralChooseProfile>
+    <GeneralDuplicateLine>Duplicar línea</GeneralDuplicateLine>
     <FontInUi>Interfaz de la Fuente</FontInUi>
     <ShowFrameRate>Mostrar tasa de cuadros en barra herramientas</ShowFrameRate>
     <DefaultFrameRate>Tasa de cuadros por defecto</DefaultFrameRate>
diff --git a/src/ui/Languages/es-MX.xml b/src/ui/Languages/es-MX.xml
index 18144169b..e85502548 100644
--- a/src/ui/Languages/es-MX.xml
+++ b/src/ui/Languages/es-MX.xml
@@ -1778,8 +1778,8 @@ puedan editar el mismo archivo de subtítulo (colaboración)</Information>
     <GoToBookmark>Ir al marcador</GoToBookmark>
     <GoToPreviousBookmark>Ir al marcador anterior</GoToPreviousBookmark>
     <GoToNextBookmark>Ir al siguiente marcador</GoToNextBookmark>
-    <ChooseProfile>Elegir perfil</ChooseProfile>
-    <DuplicateLine>Duplicar línea</DuplicateLine>
+    <GeneralChooseProfile>Elegir perfil</GeneralChooseProfile>
+    <GeneralDuplicateLine>Duplicar línea</GeneralDuplicateLine>
     <FontInUi>Interfaz de la Fuente</FontInUi>
     <ShowFrameRate>Mostrar tasa de cuadros en barra herramientas</ShowFrameRate>
     <DefaultFrameRate>Tasa de cuadros por defecto</DefaultFrameRate>
diff --git a/src/ui/Languages/eu-ES.xml b/src/ui/Languages/eu-ES.xml
index 2bdef0bd3..f757ac3fc 100644
--- a/src/ui/Languages/eu-ES.xml
+++ b/src/ui/Languages/eu-ES.xml
@@ -1794,8 +1794,8 @@ Jarraitu horrela ere?</PromptInsertSubtitleOverlap>
     <GoToBookmark>Joan lastermarkara</GoToBookmark>
     <GoToPreviousBookmark>Joan aurreko lastermarkara</GoToPreviousBookmark>
     <GoToNextBookmark>Joan hurrengo lastermarkara</GoToNextBookmark>
-    <ChooseProfile>Hautatu profila</ChooseProfile>
-    <DuplicateLine>Bikoiztu lerroa</DuplicateLine>
+    <GeneralChooseProfile>Hautatu profila</GeneralChooseProfile>
+    <GeneralDuplicateLine>Bikoiztu lerroa</GeneralDuplicateLine>
     <FontInUi>EI Hizkia</FontInUi>
     <ShowFrameRate>Erakutsi frame neurria tresnabarran</ShowFrameRate>
     <DefaultFrameRate>Berezko frame neurria:</DefaultFrameRate>
diff --git a/src/ui/Languages/fa-IR.xml b/src/ui/Languages/fa-IR.xml
index 73b4b9b45..ee610af61 100644
--- a/src/ui/Languages/fa-IR.xml
+++ b/src/ui/Languages/fa-IR.xml
@@ -1763,7 +1763,7 @@ Continue anyway?</PromptInsertSubtitleOverlap>
     <GoToBookmark>به نشانک بروید</GoToBookmark>
     <GoToPreviousBookmark>به نشانک قبلی بروید</GoToPreviousBookmark>
     <GoToNextBookmark>به نشانک بعدی بروید</GoToNextBookmark>
-    <ChooseProfile>نمایه را انتخاب کنید</ChooseProfile>
+    <GeneralChooseProfile>نمایه را انتخاب کنید</GeneralChooseProfile>
     <FontInUi>قلم UI</FontInUi>
     <ShowFrameRate>نمایش نرخ فریم را در نوار ابزار</ShowFrameRate>
     <DefaultFrameRate>نرخ فریم پیش فرض</DefaultFrameRate>
diff --git a/src/ui/Languages/fi-FI.xml b/src/ui/Languages/fi-FI.xml
index 58d5bc9d6..e976131d0 100644
--- a/src/ui/Languages/fi-FI.xml
+++ b/src/ui/Languages/fi-FI.xml
@@ -1902,8 +1902,8 @@ Mikäli tiedostoa on muokattu Subtitle Edit:llä, varmuuskopio voi olla käytett
     <GoToBookmark>Siirry kirjanmerkkiin</GoToBookmark>
     <GoToPreviousBookmark>Siirry edelliseen kirjanmerkkiin</GoToPreviousBookmark>
     <GoToNextBookmark>Siirry seuraavaan kirjanmerkkiin</GoToNextBookmark>
-    <ChooseProfile>Valitse profiili</ChooseProfile>
-    <DuplicateLine>Kahdenna rivi</DuplicateLine>
+    <GeneralChooseProfile>Valitse profiili</GeneralChooseProfile>
+    <GeneralDuplicateLine>Kahdenna rivi</GeneralDuplicateLine>
     <FontInUi>Käyttöliittymäfontti</FontInUi>
     <ShowFrameRate>Näytä kuvataajuus</ShowFrameRate>
     <DefaultFrameRate>Kuvataajuus (oletus)</DefaultFrameRate>
diff --git a/src/ui/Languages/hu-HU.xml b/src/ui/Languages/hu-HU.xml
index df6d61747..2a361e63d 100644
--- a/src/ui/Languages/hu-HU.xml
+++ b/src/ui/Languages/hu-HU.xml
@@ -1820,8 +1820,8 @@ szerkesztheti ugyanazt a feliratfájlt</Information>
     <GoToBookmark>Ugrás a könyvjelzőre</GoToBookmark>
     <GoToPreviousBookmark>Ugrás az előző könyvjelzőre</GoToPreviousBookmark>
     <GoToNextBookmark>Ugrás a következő könyvjelzőre</GoToNextBookmark>
-    <ChooseProfile>Válasszon profilt</ChooseProfile>
-    <DuplicateLine>Ismétlődő sor</DuplicateLine>
+    <GeneralChooseProfile>Válasszon profilt</GeneralChooseProfile>
+    <GeneralDuplicateLine>Ismétlődő sor</GeneralDuplicateLine>
     <FontInUi>Felület betűtípusa</FontInUi>
     <ShowFrameRate>Képarány megjelenítése az eszköztáron</ShowFrameRate>
     <DefaultFrameRate>Alapértelmezett képarány</DefaultFrameRate>
diff --git a/src/ui/Languages/ja-JP.xml b/src/ui/Languages/ja-JP.xml
index 13bf2c89d..ea65f66a7 100644
--- a/src/ui/Languages/ja-JP.xml
+++ b/src/ui/Languages/ja-JP.xml
@@ -1562,7 +1562,7 @@ If you have edited this file with Subtitle Edit you might be able to find a back
     <GoToBookmark>ブックマークへ移動</GoToBookmark>
     <GoToPreviousBookmark>前のブックマークへ移動</GoToPreviousBookmark>
     <GoToNextBookmark>次のブックマークへ移動</GoToNextBookmark>
-    <ChooseProfile>プロファイルを選択</ChooseProfile>
+    <GeneralChooseProfile>プロファイルを選択</GeneralChooseProfile>
     <ShowFrameRate>ツール バーにフレームレートを表示する</ShowFrameRate>
     <DefaultFrameRate>既定のフレームレート</DefaultFrameRate>
     <DefaultFileEncoding>既定のファイル エンコード</DefaultFileEncoding>
diff --git a/src/ui/Languages/ko-KR.xml b/src/ui/Languages/ko-KR.xml
index 9979da67e..67870c336 100644
--- a/src/ui/Languages/ko-KR.xml
+++ b/src/ui/Languages/ko-KR.xml
@@ -1921,8 +1921,8 @@ Google 번역 API 키를 입력하려면 "옵션 -&gt; 환경설정 -&gt; 도구
     <GoToBookmark>책갈피로 이동</GoToBookmark>
     <GoToPreviousBookmark>이전 책갈피로 이동</GoToPreviousBookmark>
     <GoToNextBookmark>다음 책갈피로 이동</GoToNextBookmark>
-    <ChooseProfile>프로필 선택</ChooseProfile>
-    <DuplicateLine>중복 줄</DuplicateLine>
+    <GeneralChooseProfile>프로필 선택</GeneralChooseProfile>
+    <GeneralDuplicateLine>중복 줄</GeneralDuplicateLine>
     <FontInUi>UI 글꼴</FontInUi>
     <ShowFrameRate>도구 모음에 프레임 속도 표시</ShowFrameRate>
     <DefaultFrameRate>기본 프레임 속도</DefaultFrameRate>
diff --git a/src/ui/Languages/mk-MK.xml b/src/ui/Languages/mk-MK.xml
index 380a4bdfa..97b40808b 100644
--- a/src/ui/Languages/mk-MK.xml
+++ b/src/ui/Languages/mk-MK.xml
@@ -1822,8 +1822,8 @@ Email: mailto:nikse.dk@gmail.com</AboutText1>
     <GoToBookmark>Оди на ознака</GoToBookmark>
     <GoToPreviousBookmark>Оди на претходна ознака</GoToPreviousBookmark>
     <GoToNextBookmark>Оди на следна ознака</GoToNextBookmark>
-    <ChooseProfile>Избери профил</ChooseProfile>
-    <DuplicateLine>Направи дупликат од линијата</DuplicateLine>
+    <GeneralChooseProfile>Избери профил</GeneralChooseProfile>
+    <GeneralDuplicateLine>Направи дупликат од линијата</GeneralDuplicateLine>
     <FontInUi>UI Фонт</FontInUi>
     <ShowFrameRate>Прикажи број на кадри во алатник</ShowFrameRate>
     <DefaultFrameRate>Стандарден број на кадри</DefaultFrameRate>
diff --git a/src/ui/Languages/nl-NL.xml b/src/ui/Languages/nl-NL.xml
index 162827c0a..c722ef45b 100644
--- a/src/ui/Languages/nl-NL.xml
+++ b/src/ui/Languages/nl-NL.xml
@@ -1810,8 +1810,8 @@ hetzelfde ondertitelbestand bewerken (samenwerken)</Information>
     <GoToBookmark>Naar bladwijzer</GoToBookmark>
     <GoToPreviousBookmark>Naar vorige bladwijzer</GoToPreviousBookmark>
     <GoToNextBookmark>Naar volgende bladwijzer</GoToNextBookmark>
-    <ChooseProfile>Profiel kiezen</ChooseProfile>
-    <DuplicateLine>Identieke ondertitel</DuplicateLine>
+    <GeneralChooseProfile>Profiel kiezen</GeneralChooseProfile>
+    <GeneralDuplicateLine>Identieke ondertitel</GeneralDuplicateLine>
     <FontInUi>Lettertype interface</FontInUi>
     <ShowFrameRate>Beeldsnelheid in werkbalk weergeven</ShowFrameRate>
     <DefaultFrameRate>Standaardbeeldsnelheid</DefaultFrameRate>
diff --git a/src/ui/Languages/pl-PL.xml b/src/ui/Languages/pl-PL.xml
index e7c23e1d5..bb3fd1ed7 100644
--- a/src/ui/Languages/pl-PL.xml
+++ b/src/ui/Languages/pl-PL.xml
@@ -1914,8 +1914,8 @@ może edytować ten sam plik z napisami (współpracować)</Information>
     <GoToBookmark>Przejdź do zakładki</GoToBookmark>
     <GoToPreviousBookmark>Przejdź do poprzedniej zakładki</GoToPreviousBookmark>
     <GoToNextBookmark>Przejdź do następnej zakładki</GoToNextBookmark>
-    <ChooseProfile>Wybierz profil</ChooseProfile>
-    <DuplicateLine>Duplikat linii</DuplicateLine>
+    <GeneralChooseProfile>Wybierz profil</GeneralChooseProfile>
+    <GeneralDuplicateLine>Duplikat linii</GeneralDuplicateLine>
     <FontInUi>Czcionka interfejsu użytkownika</FontInUi>
     <ShowFrameRate>Pokaż ilość klatek/sekundę na Pasku narzędzi</ShowFrameRate>
     <DefaultFrameRate>Domyślna ilość klatek/sekundę</DefaultFrameRate>
diff --git a/src/ui/Languages/pt-BR.xml b/src/ui/Languages/pt-BR.xml
index aa1329d82..bcdcacc75 100644
--- a/src/ui/Languages/pt-BR.xml
+++ b/src/ui/Languages/pt-BR.xml
@@ -1800,8 +1800,8 @@ podem editar o mesmo arquivo de legenda (colaboração)</Information>
     <GoToBookmark>Ir para marcador</GoToBookmark>
     <GoToPreviousBookmark>Ir para o marcador anterior</GoToPreviousBookmark>
     <GoToNextBookmark>Ir para o próximo marcador</GoToNextBookmark>
-    <ChooseProfile>Escolha o perfil</ChooseProfile>
-    <DuplicateLine>Duplicar linha</DuplicateLine>
+    <GeneralChooseProfile>Escolha o perfil</GeneralChooseProfile>
+    <GeneralDuplicateLine>Duplicar linha</GeneralDuplicateLine>
     <FontInUi>Fonte da interface</FontInUi>
     <ShowFrameRate>Mostrar taxa de quadros na barra de ferramentas</ShowFrameRate>
     <DefaultFrameRate>Taxa de quadros padrão</DefaultFrameRate>
diff --git a/src/ui/Languages/pt-PT.xml b/src/ui/Languages/pt-PT.xml
index 59307e68f..21f859091 100644
--- a/src/ui/Languages/pt-PT.xml
+++ b/src/ui/Languages/pt-PT.xml
@@ -1820,8 +1820,8 @@ editar o mesmo ficheiro de legenda (colaboração)</Information>
     <GoToBookmark>Ir para o marcador</GoToBookmark>
     <GoToPreviousBookmark>Ir para o marcador anterior</GoToPreviousBookmark>
     <GoToNextBookmark>Ir para o marcador seguinte</GoToNextBookmark>
-    <ChooseProfile>Escolher perfil</ChooseProfile>
-    <DuplicateLine>Duplicar linha</DuplicateLine>
+    <GeneralChooseProfile>Escolher perfil</GeneralChooseProfile>
+    <GeneralDuplicateLine>Duplicar linha</GeneralDuplicateLine>
     <FontInUi>Tipo de letra da Interface</FontInUi>
     <ShowFrameRate>Mostrar taxa de fotogramas na barra de ferramentas</ShowFrameRate>
     <DefaultFrameRate>Taxa de fotogramas padrão</DefaultFrameRate>
diff --git a/src/ui/Languages/ro-RO.xml b/src/ui/Languages/ro-RO.xml
index 85a0c201d..7c4ea74b5 100644
--- a/src/ui/Languages/ro-RO.xml
+++ b/src/ui/Languages/ro-RO.xml
@@ -1808,8 +1808,8 @@ pot edita acelasi fișier de subtitrare (colaborare)</Information>
     <GoToBookmark>Treci la marcaj</GoToBookmark>
     <GoToPreviousBookmark>Treci la marcajul anterior</GoToPreviousBookmark>
     <GoToNextBookmark>Treci la marcajul următor</GoToNextBookmark>
-    <ChooseProfile>Alege profilul</ChooseProfile>
-    <DuplicateLine>Linie dublată</DuplicateLine>
+    <GeneralChooseProfile>Alege profilul</GeneralChooseProfile>
+    <GeneralDuplicateLine>Linie dublată</GeneralDuplicateLine>
     <FontInUi>Font UI</FontInUi>
     <ShowFrameRate>Arată rata cadrului în bara de unelte</ShowFrameRate>
     <DefaultFrameRate>Rata implicită a cadrului</DefaultFrameRate>
diff --git a/src/ui/Languages/ru-RU.xml b/src/ui/Languages/ru-RU.xml
index 798ee83b8..50c1b0c9d 100644
--- a/src/ui/Languages/ru-RU.xml
+++ b/src/ui/Languages/ru-RU.xml
@@ -1834,8 +1834,8 @@ https://github.com/SubtitleEdit/subtitleedit
     <GoToBookmark>Перейти в закладки</GoToBookmark>
     <GoToPreviousBookmark>Перейти к предыдущей закладке</GoToPreviousBookmark>
     <GoToNextBookmark>Перейти к следующей закладке</GoToNextBookmark>
-    <ChooseProfile>Выберите профиль</ChooseProfile>
-    <DuplicateLine>Дублировать линию</DuplicateLine>
+    <GeneralChooseProfile>Выберите профиль</GeneralChooseProfile>
+    <GeneralDuplicateLine>Дублировать линию</GeneralDuplicateLine>
     <FontInUi>Шрифты для Интерфейса Пользователя (UI)</FontInUi>
     <ShowFrameRate>Показывать частоту кадров в панели инструментов</ShowFrameRate>
     <DefaultFrameRate>Частота кадров по умолчанию</DefaultFrameRate>
diff --git a/src/ui/Languages/sr-Latn-RS.xml b/src/ui/Languages/sr-Latn-RS.xml
index 974f46201..9ee46a490 100644
--- a/src/ui/Languages/sr-Latn-RS.xml
+++ b/src/ui/Languages/sr-Latn-RS.xml
@@ -1772,7 +1772,7 @@ da uređujete određeni prevod sa drugim ljudima.</Information>
     <GoToBookmark>Idi na marker</GoToBookmark>
     <GoToPreviousBookmark>Idi na prethodni marker</GoToPreviousBookmark>
     <GoToNextBookmark>Idi na sledeći marker</GoToNextBookmark>
-    <ChooseProfile>Izaberi profil</ChooseProfile>
+    <GeneralChooseProfile>Izaberi profil</GeneralChooseProfile>
     <FontInUi>UI Font</FontInUi>
     <ShowFrameRate>Prikaži broj kadrova u traci sa alatkama</ShowFrameRate>
     <DefaultFrameRate>Podrazumevani broj kadrova</DefaultFrameRate>
diff --git a/src/ui/Languages/tr-TR.xml b/src/ui/Languages/tr-TR.xml
index 68723e082..45a8be3c9 100644
--- a/src/ui/Languages/tr-TR.xml
+++ b/src/ui/Languages/tr-TR.xml
@@ -1937,8 +1937,8 @@ Yeni oturum başlatın (işbirliği)</Information>
     <GoToBookmark>Yer imine git</GoToBookmark>
     <GoToPreviousBookmark>Önceki yer imine git</GoToPreviousBookmark>
     <GoToNextBookmark>Sonraki yer imine git</GoToNextBookmark>
-    <ChooseProfile>Profil seçin</ChooseProfile>
-    <DuplicateLine>Yinelenen satır</DuplicateLine>
+    <GeneralChooseProfile>Profil seçin</GeneralChooseProfile>
+    <GeneralDuplicateLine>Yinelenen satır</GeneralDuplicateLine>
     <FontInUi>UI Font</FontInUi>
     <ShowFrameRate>Kare hızını araç çubuğunda göster</ShowFrameRate>
     <DefaultFrameRate>Varsayılan kare hızı</DefaultFrameRate>
diff --git a/src/ui/Languages/zh-Hans.xml b/src/ui/Languages/zh-Hans.xml
index bbc9d1261..8f587c787 100644
--- a/src/ui/Languages/zh-Hans.xml
+++ b/src/ui/Languages/zh-Hans.xml
@@ -1920,8 +1920,8 @@ Command line: {1} {2}
     <GoToBookmark>转到书签</GoToBookmark>
     <GoToPreviousBookmark>转到上一书签</GoToPreviousBookmark>
     <GoToNextBookmark>转到下一书签</GoToNextBookmark>
-    <ChooseProfile>选择预设方案</ChooseProfile>
-    <DuplicateLine>复制行</DuplicateLine>
+    <GeneralChooseProfile>选择预设方案</GeneralChooseProfile>
+    <GeneralDuplicateLine>复制行</GeneralDuplicateLine>
     <FontInUi>用户界面字体</FontInUi>
     <ShowFrameRate>在工具栏显示帧率</ShowFrameRate>
     <DefaultFrameRate>默认帧率</DefaultFrameRate>
diff --git a/src/ui/Logic/MainShortcuts.cs b/src/ui/Logic/MainShortcuts.cs
index 205d2ac5f..0eae710e0 100644
--- a/src/ui/Logic/MainShortcuts.cs
+++ b/src/ui/Logic/MainShortcuts.cs
@@ -68,7 +68,6 @@ namespace Nikse.SubtitleEdit.Logic
         public Keys MainGoToPrevSubtitleAndPlay { get; set; }
         public Keys MainGoToNextSubtitleAndPlay { get; set; }
         public Keys MainAutoCalcCurrentDuration { get; set; }
-        public Keys MainUnbreakNoSpace { get; set; }
         public Keys MainGeneralToggleBookmarks { get; set; }
         public Keys MainGeneralClearBookmarks { get; set; }
         public Keys MainGeneralGoToBookmark { get; set; }
@@ -139,6 +138,7 @@ namespace Nikse.SubtitleEdit.Logic
         public Keys MainInsertBefore { get; set; }
         public Keys MainTextBoxAutoBreak { get; set; }
         public Keys MainTextBoxUnbreak { get; set; }
+        public Keys MainTextBoxUnbreakNoSpace { get; set; }
         public Keys MainTextBoxBreakAtCursorPosition { get; set; }
         public Keys MainTextBoxBreakAtCursorPositionAndGoToNext { get; set; }
         public Keys MainMergeDialog { get; set; }
@@ -248,15 +248,14 @@ namespace Nikse.SubtitleEdit.Logic
             MainGoToPrevSubtitleAndPlay = UiUtil.GetKeys(Configuration.Settings.Shortcuts.GeneralGoToPrevSubtitleAndPlay);
             MainGoToNextSubtitleAndPlay = UiUtil.GetKeys(Configuration.Settings.Shortcuts.GeneralGoToNextSubtitleAndPlay);
             MainAutoCalcCurrentDuration = UiUtil.GetKeys(Configuration.Settings.Shortcuts.GeneralAutoCalcCurrentDuration);
-            MainUnbreakNoSpace = UiUtil.GetKeys(Configuration.Settings.Shortcuts.GeneralUnbrekNoSpace);
             MainGeneralToggleBookmarks = UiUtil.GetKeys(Configuration.Settings.Shortcuts.GeneralToggleBookmarks);
             MainGeneralClearBookmarks = UiUtil.GetKeys(Configuration.Settings.Shortcuts.GeneralClearBookmarks);
             MainGeneralGoToBookmark = UiUtil.GetKeys(Configuration.Settings.Shortcuts.GeneralGoToBookmark);
             MainGeneralGoToPreviousBookmark = UiUtil.GetKeys(Configuration.Settings.Shortcuts.GeneralGoToPreviousBookmark);
             MainGeneralGoToNextBookmark = UiUtil.GetKeys(Configuration.Settings.Shortcuts.GeneralGoToNextBookmark);
-            MainGeneralChooseProfile = UiUtil.GetKeys(Configuration.Settings.Shortcuts.ChooseProfile);
-            MainGeneralDuplicateLine = UiUtil.GetKeys(Configuration.Settings.Shortcuts.DuplicateLine);
-            MainGeneralToggleView = UiUtil.GetKeys(Configuration.Settings.Shortcuts.ToggleView);
+            MainGeneralChooseProfile = UiUtil.GetKeys(Configuration.Settings.Shortcuts.GeneralChooseProfile);
+            MainGeneralDuplicateLine = UiUtil.GetKeys(Configuration.Settings.Shortcuts.GeneralDuplicateLine);
+            MainGeneralToggleView = UiUtil.GetKeys(Configuration.Settings.Shortcuts.GeneralToggleView);
             MainVideoFullscreen = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainVideoFullscreen);
             MainVideoSlower = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainVideoSlower);
             MainVideoFaster = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainVideoFaster);
@@ -349,6 +348,7 @@ namespace Nikse.SubtitleEdit.Logic
             MainTextBoxBreakAtCursorPosition = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainTextBoxBreakAtPosition);
             MainTextBoxBreakAtCursorPositionAndGoToNext = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainTextBoxBreakAtPositionAndGoToNext);
             MainTextBoxUnbreak = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainTextBoxUnbreak);
+            MainTextBoxUnbreakNoSpace = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainTextBoxUnbreakNoSpace);
             MainMergeDialog = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainMergeDialog);
             MainToggleFocus = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainToggleFocus);
             MainToggleFocusWaveform = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainToggleFocusWaveform);