diff --git a/src/components/libraryoptionseditor/libraryoptionseditor.js b/src/components/libraryoptionseditor/libraryoptionseditor.js
index 67c8e3a012..e3b30df5cf 100644
--- a/src/components/libraryoptionseditor/libraryoptionseditor.js
+++ b/src/components/libraryoptionseditor/libraryoptionseditor.js
@@ -475,6 +475,12 @@ export function setContentType(parent, contentType) {
     parent.querySelector('.trickplaySettingsSection').classList.toggle('hide', !hasChapterOptions);
     parent.querySelector('.chapterSettingsSection').classList.toggle('hide', !hasChapterOptions);
 
+    if (contentType === 'tvshows' || contentType === 'movies' || contentType === 'musicvideos') {
+        parent.querySelector('.chkEnableVersionGroupingContainer').classList.remove('hide');
+    } else {
+        parent.querySelector('.chkEnableVersionGroupingContainer').classList.add('hide');
+    }
+
     if (contentType === 'tvshows') {
         parent.querySelector('.chkAutomaticallyGroupSeriesContainer').classList.remove('hide');
         parent.querySelector('.fldSeasonZeroDisplayName').classList.remove('hide');
@@ -635,6 +641,7 @@ export function getLibraryOptions(parent) {
         EnableInternetProviders: true,
         SaveLocalMetadata: parent.querySelector('#chkSaveLocal').checked,
         EnableAutomaticSeriesGrouping: parent.querySelector('.chkAutomaticallyGroupSeries').checked,
+        EnableVersionGrouping: parent.querySelector('.chkEnableVersionGrouping').checked,
         PreferredMetadataLanguage: parent.querySelector('#selectLanguage').value,
         MetadataCountryCode: parent.querySelector('#selectCountry').value,
         SeasonZeroDisplayName: parent.querySelector('#txtSeasonZeroName').value,
@@ -707,6 +714,7 @@ export function setLibraryOptions(parent, options) {
     parent.querySelector('.chkExtractChapterImages').checked = options.EnableChapterImageExtraction;
     parent.querySelector('#chkSaveLocal').checked = options.SaveLocalMetadata;
     parent.querySelector('.chkAutomaticallyGroupSeries').checked = options.EnableAutomaticSeriesGrouping;
+    parent.querySelector('.chkEnableVersionGrouping').checked = options.EnableVersionGrouping;
     parent.querySelector('#chkEnableEmbeddedTitles').checked = options.EnableEmbeddedTitles;
     parent.querySelector('.chkEnableEmbeddedExtrasTitlesContainer').classList.toggle('hide', !options.EnableEmbeddedTitles);
     parent.querySelector('#chkEnableEmbeddedExtrasTitles').checked = options.EnableEmbeddedExtrasTitles;
diff --git a/src/components/libraryoptionseditor/libraryoptionseditor.template.html b/src/components/libraryoptionseditor/libraryoptionseditor.template.html
index f487bc482b..407f118ce8 100644
--- a/src/components/libraryoptionseditor/libraryoptionseditor.template.html
+++ b/src/components/libraryoptionseditor/libraryoptionseditor.template.html
@@ -112,6 +112,14 @@
     <div class="fieldDescription checkboxFieldDescription">${OptionAutomaticallyGroupSeriesHelp}</div>
 </div>
 
+<div class="checkboxContainer checkboxContainer-withDescription chkEnableVersionGroupingContainer hide advanced">
+    <label>
+        <input is="emby-checkbox" type="checkbox" class="chkEnableVersionGrouping" />
+        <span>${OptionEnableVersionGrouping}</span>
+    </label>
+    <div class="fieldDescription checkboxFieldDescription">${OptionEnableVersionGroupingHelp}</div>
+</div>
+
 <div class="mediaSegmentProviders advanced hide" style="margin-bottom: 2em;">
 </div>
 
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index a67b8325de..d9fce8628a 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -1237,6 +1237,8 @@
     "OptionAllowVideoPlaybackTranscoding": "Allow video playback that requires transcoding",
     "OptionAutomaticallyGroupSeries": "Automatically merge series that are spread across multiple folders",
     "OptionAutomaticallyGroupSeriesHelp": "Series that are spread across multiple folders within this library will be automatically merged into a single series.",
+    "OptionEnableVersionGrouping": "Automatically group different versions of episodes or movies",
+    "OptionEnableVersionGroupingHelp": "Grouping happens according to naming rules described in the docs.",
     "OptionBluray": "BD",
     "OptionCommunityRating": "Community Rating",
     "OptionCriticRating": "Critics Rating",