diff --git a/CHANGELOG.md b/CHANGELOG.md
index a964bfb1..03b3c7cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,17 @@
 # Changelog
 
-## v2.3.0
+## v2.4.0 (Unreleased)
 
 <!--Releasenotes start-->
+- Added a new option to shuffle only from shorts.
+- Fixed bugs that would prevent some initialization logic to run whenever the extension is updated.
+<!--Releasenotes end-->
+
+## v2.3.0
+
 - Shuffling when excluding shorts is now a lot quicker if you have shuffled from the channel before, as the extension will remember which videos are shorts and skip them automatically.
 - Added an additional message to the shuffle button if shuffling takes a bit longer due to ignoring shorts.
 - Fixed a rare data inconsistency bug occurring with specific database values.
-<!--Releasenotes end-->
 
 ## v2.2.4
 
diff --git a/README.md b/README.md
index 77634d4e..f3d4d80f 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ Chrome Web Store:
   <img src="https://img.shields.io/chrome-web-store/v/kijgnjhogkjodpakfmhgleobifempckf?label=version"
     alt="Chrome web store version"></a>
 <a href="https://chrome.google.com/webstore/detail/random-youtube-video/kijgnjhogkjodpakfmhgleobifempckf">
-  <img src="https://img.shields.io/chrome-web-store/rating/kijgnjhogkjodpakfmhgleobifempckf?label=rating"
+  <img src="https://img.shields.io/chrome-web-store/stars/kijgnjhogkjodpakfmhgleobifempckf?label=rating"
     alt="Chrome web store rating"></a>
 <a href="https://chrome.google.com/webstore/detail/random-youtube-video/kijgnjhogkjodpakfmhgleobifempckf">
   <img src="https://img.shields.io/chrome-web-store/users/kijgnjhogkjodpakfmhgleobifempckf?label=users"
@@ -19,7 +19,7 @@ Firefox:
 <img src="https://img.shields.io/amo/v/random-youtube-video?label=version"
 		alt="Firefox version"></a>
 <a href="https://addons.mozilla.org/en-GB/firefox/addon/random-youtube-video/">
-	<img src="https://img.shields.io/amo/rating/random-youtube-video?label=rating"
+	<img src="https://img.shields.io/amo/stars/random-youtube-video?label=rating"
 		alt="Firefox rating"></a>
 <a href="https://addons.mozilla.org/en-GB/firefox/addon/random-youtube-video/">
 	<img alt="Mozilla Add-on" src="https://img.shields.io/amo/users/random-youtube-video?label=users"
diff --git a/src/background.js b/src/background.js
index 936f5ec3..24ee75e1 100644
--- a/src/background.js
+++ b/src/background.js
@@ -3,8 +3,20 @@
 import { configSync, setSyncStorageValue } from "./chromeStorage.js";
 
 // ---------- Initialization/Chrome event listeners ----------
-// On Chrome startup, we make sure we are not using too much local storage
-chrome.runtime.onStartup.addListener(async function () {
+
+// Check whether a new version was installed
+async function initExtension() {
+	const manifestData = chrome.runtime.getManifest();
+	if (configSync.previousVersion < manifestData.version) {
+		await handleExtensionUpdate(manifestData, configSync.previousVersion);
+	}
+
+	checkLocalStorageCapacity();
+}
+await initExtension();
+
+// Make sure we are not using too much local storage
+async function checkLocalStorageCapacity() {
 	// If over 90% of the storage quota for playlists is used, remove playlists that have not been accessed in a long time
 	const utilizedStorage = await chrome.storage.local.getBytesInUse();
 	const maxLocalStorage = chrome.storage.local.QUOTA_BYTES;
@@ -32,25 +44,11 @@ chrome.runtime.onStartup.addListener(async function () {
 			chrome.storage.local.remove(playlistId);
 		}
 	}
-});
-
-// Check whether a new version was installed
-chrome.runtime.onInstalled.addListener(async function (details) {
-	const manifestData = chrome.runtime.getManifest();
-
-	if (details.reason == "update" && details.previousVersion !== manifestData.version) {
-		await handleExtensionUpdate(manifestData, details.previousVersion);
-	} else if (details.reason == "install") {
-		await handleExtensionInstall(manifestData);
-	}
-});
-
-async function handleExtensionInstall(manifestData) {
-	console.log(`Extension was installed (v${manifestData.version})`);
 }
 
 async function handleExtensionUpdate(manifestData, previousVersion) {
 	console.log(`Extension was updated to version v${manifestData.version}`);
+	await setSyncStorageValue("previousVersion", manifestData.version);
 
 	// Handle changes that may be specific to a certain version change
 	await handleVersionSpecificUpdates(previousVersion);
@@ -69,7 +67,18 @@ async function handleExtensionUpdate(manifestData, previousVersion) {
 }
 
 async function handleVersionSpecificUpdates(previousVersion) {
-	// v1.5.0 added renamed some keys in the channelSettings object
+	// v2.4.0 changed the data type for the shuffleIgnoreShortsOption from boolean to number
+	if (previousVersion < "2.4.0") {
+		console.log("Updating sync storage to v2.4.0 format...");
+		const syncStorageContents = await chrome.storage.sync.get();
+		if (syncStorageContents["shuffleIgnoreShortsOption"] == true) {
+			await setSyncStorageValue("shuffleIgnoreShortsOption", 2);
+		} else {
+			await setSyncStorageValue("shuffleIgnoreShortsOption", 1);
+		}
+	}
+
+	// v1.5.0 renamed some keys in the channelSettings object
 	if (previousVersion < "1.5.0") {
 		console.log("Updating channelSettings to v1.5.0 format...");
 
@@ -83,7 +92,7 @@ async function handleVersionSpecificUpdates(previousVersion) {
 				delete channelSetting["shufflePercentage"];
 			}
 		}
-		await chrome.storage.sync.set(configSyncValues);
+		await setSyncStorageValue(configSyncValues);
 	}
 
 	// v1.3.0 removed the "youtubeAPIKey" key from local storage, which was replaced by the "youtubeAPIKeys" key
diff --git a/src/config.js b/src/config.js
index 9d40ec79..6d8513da 100644
--- a/src/config.js
+++ b/src/config.js
@@ -11,7 +11,8 @@ export const configSyncDefaults = {
 	// These properties influence the behavior of the "Shuffle" button
 	"shuffleOpenInNewTabOption": true,
 	"shuffleReUseNewTabOption": true,
-	"shuffleIgnoreShortsOption": false,
+	// 0 = only shorts, 1 = no option set (shorts are included), 2 = ignore shorts
+	"shuffleIgnoreShortsOption": 1,
 	"shuffleOpenAsPlaylistOption": true,
 	// How many random videos to add to a playlist
 	"shuffleNumVideosInPlaylist": 10,
@@ -34,6 +35,9 @@ export const configSyncDefaults = {
 	"lastViewedChangelogVersion": "0",
 	// For april fools: Will be the number of the year in which the user was last rickrolled (we only want to rickroll the user once per year)
 	"wasLastRickRolledInYear": "1970",
+	// Used when updating the extension
+	/* c8 ignore next */
+	"previousVersion": typeof chrome !== "undefined" ? chrome.runtime.getManifest().version : "0",
 };
 
 export const shufflingHints = [
diff --git a/src/content.js b/src/content.js
index 6a65586b..efd9ead4 100644
--- a/src/content.js
+++ b/src/content.js
@@ -141,7 +141,7 @@ async function shuffleVideos() {
 		var hasBeenShuffled = false;
 		setDOMTextWithDelay(shuffleButtonTextElement, "\xa0Shuffling...", 1000, () => { return (shuffleButtonTextElement.innerText === "\xa0Shuffle" && !hasBeenShuffled); });
 		setDOMTextWithDelay(shuffleButtonTextElement, "\xa0Still on it...", 5000, () => { return (shuffleButtonTextElement.innerText === "\xa0Shuffling..." && !hasBeenShuffled); });
-		if (configSync.shuffleIgnoreShortsOption) {
+		if (configSync.shuffleIgnoreShortsOption != "1") {
 			setDOMTextWithDelay(shuffleButtonTextElement, "\xa0Sorting shorts...", 8000, () => { return (shuffleButtonTextElement.innerText === "\xa0Still on it..." && !hasBeenShuffled); });
 		}
 
diff --git a/src/html/popup/popup.js b/src/html/popup/popup.js
index 92c97ed5..ecd45ee3 100644
--- a/src/html/popup/popup.js
+++ b/src/html/popup/popup.js
@@ -35,8 +35,8 @@ function getPopupDomElements() {
 		shuffleOpenInNewTabOptionToggle: document.getElementById("shuffleOpenInNewTabOptionToggle"),
 		// Shuffling: Reuse tab option toggle
 		shuffleReUseNewTabOptionToggle: document.getElementById("shuffleReUseNewTabOptionToggle"),
-		// Shuffling : Ignore shorts option toggle
-		shuffleIgnoreShortsOptionToggle: document.getElementById("shuffleIgnoreShortsOptionToggle"),
+		// Shuffling : Ignore shorts option dropdown
+		shuffleIgnoreShortsOptionDropdown: document.getElementById("shuffleIgnoreShortsOptionDropdown"),
 		// Shuffling: Open as playlist option toggle
 		shuffleOpenAsPlaylistOptionToggle: document.getElementById("shuffleOpenAsPlaylistOptionToggle"),
 		// Shuffling: Number of videos in playlist div
@@ -117,8 +117,8 @@ async function setPopupDomElementValuesFromConfig(domElements) {
 	// If this option is enabled depends on the state of the shuffleOpenInNewTabOptionToggle
 	manageDependents(domElements, domElements.shuffleOpenInNewTabOptionToggle, configSync.shuffleOpenInNewTabOption);
 
-	// ----- Shuffling: Ignore shorts option toggle -----
-	domElements.shuffleIgnoreShortsOptionToggle.checked = configSync.shuffleIgnoreShortsOption;
+	// ----- Shuffling: Ignore shorts option dropdown -----
+	domElements.shuffleIgnoreShortsOptionDropdown.value = configSync.shuffleIgnoreShortsOption;
 
 	// ----- Shuffling: Open as playlist option toggle -----
 	domElements.shuffleOpenAsPlaylistOptionToggle.checked = configSync.shuffleOpenAsPlaylistOption;
@@ -204,11 +204,11 @@ async function setPopupDomElemenEventListeners(domElements) {
 		manageDependents(domElements, domElements.shuffleReUseNewTabOptionToggle, this.checked);
 	});
 
-	// Shuffling: Ignore shorts option toggle
-	domElements.shuffleIgnoreShortsOptionToggle.addEventListener("change", async function () {
-		await setSyncStorageValue("shuffleIgnoreShortsOption", this.checked);
+	// Shuffling: Ignore shorts option dropdown
+	domElements.shuffleIgnoreShortsOptionDropdown.addEventListener("change", async function () {
+		await setSyncStorageValue("shuffleIgnoreShortsOption", this.value);
 
-		manageDependents(domElements, domElements.shuffleIgnoreShortsOptionToggle, this.checked);
+		manageDependents(domElements, domElements.shuffleIgnoreShortsOptionDropdown, this.value);
 	});
 
 	// Shuffling: Open as playlist option toggle
diff --git a/src/shuffleVideo.js b/src/shuffleVideo.js
index 830560a6..02c3c454 100644
--- a/src/shuffleVideo.js
+++ b/src/shuffleVideo.js
@@ -697,11 +697,15 @@ async function chooseRandomVideosFromPlaylist(playlistInfo, channelId, shouldUpd
 	let allUnknownType = Object.assign({}, playlistInfo["videos"]["unknownType"], playlistInfo["newVideos"] ?? {});
 	let allKnownVideos = playlistInfo["videos"]["knownVideos"];
 	let allKnownShorts = playlistInfo["videos"]["knownShorts"];
+	let allVideos;
 
-	let allVideos = Object.assign({}, allUnknownType, allKnownVideos);
-	// Only if we are not ignoring shorts, we want to include them in the shuffle
-	if (!configSync.shuffleIgnoreShortsOption) {
-		allVideos = Object.assign({}, allVideos, allKnownShorts);
+	// 0 = only shorts, 1 = no option set (shorts are included), 2 = ignore shorts
+	if (configSync.shuffleIgnoreShortsOption == "1") {
+		allVideos = Object.assign({}, allUnknownType, allKnownVideos, allKnownShorts);
+	} else if (configSync.shuffleIgnoreShortsOption == "2") {
+		allVideos = Object.assign({}, allUnknownType, allKnownVideos);
+	} else {
+		allVideos = Object.assign({}, allUnknownType, allKnownShorts);
 	}
 
 	let videosByDate = Object.keys(allVideos).sort((a, b) => {
@@ -716,7 +720,7 @@ async function chooseRandomVideosFromPlaylist(playlistInfo, channelId, shouldUpd
 
 	const numVideosToChoose = configSync.shuffleOpenAsPlaylistOption ? configSync.shuffleNumVideosInPlaylist : 1;
 
-	console.log(`Choosing ${numVideosToChoose} random video${numVideosToChoose > 1 ? "s" : ""}.`);
+	console.log(`Choosing ${numVideosToChoose} random video(s).`);
 
 	// We use this label to break out of both the for loop and the while loop if there are no more videos after encountering a deleted video
 	outerLoop:
@@ -750,7 +754,7 @@ async function chooseRandomVideosFromPlaylist(playlistInfo, channelId, shouldUpd
 						throw new RandomYoutubeVideoError(
 							{
 								code: "RYV-6B",
-								message: "All previously uploaded videos on this channel were deleted (the channel does not have any uploads) or you are ignoring shorts and the channel has only uploaded shorts.",
+								message: "All previously uploaded videos on this channel were deleted (the channel does not have any uploads) or you are ignoring/only shuffling from shorts and the channel only has/has no shorts.",
 								solveHint: "If you are ignoring shorts, disable the option in the popup to shuffle from this channel.",
 								showTrace: false
 							}
@@ -761,17 +765,31 @@ async function chooseRandomVideosFromPlaylist(playlistInfo, channelId, shouldUpd
 						console.log(`No more videos to choose from (${numVideosToChoose - i} videos too few uploaded on channel).`);
 						break outerLoop;
 					}
-					/* c8 ignore stop */
 				}
+				/* c8 ignore stop */
 			} while (!await testVideoExistence(randomVideo))
 		}
 
-		// If the user does not want to shuffle from shorts, and we do not yet know the type of the chosen video, we check if it is a short
-		if (configSync.shuffleIgnoreShortsOption) {
+		// 0 = only shorts, 1 = no option set (shorts are included), 2 = ignore shorts
+		// If the user does not want to shuffle from shorts, or only wants to shuffle from shorts, and we do not yet know the type of the chosen video, we check if it is a short or not
+		if (configSync.shuffleIgnoreShortsOption != "1") {
 			if (playlistInfo["videos"]["unknownType"][randomVideo] !== undefined) {
 				const videoIsShort = await isShort(randomVideo);
 
-				if (videoIsShort) {
+				// What follows is dependent on if the video is a short or not, and the user's settings
+
+				// Case 1: !isShort && ignoreShorts => Success
+				if (!videoIsShort && configSync.shuffleIgnoreShortsOption == "2") {
+					// Move the video to the knownVideos subdictionary
+					playlistInfo["videos"]["knownVideos"][randomVideo] = playlistInfo["videos"]["unknownType"][randomVideo];
+					delete playlistInfo["videos"]["unknownType"][randomVideo];
+
+					// The video is not a short, so add it to the list of chosen videos and remove it from the pool of videos to choose from
+					chosenVideos.push(randomVideo);
+					videosToShuffle.splice(videosToShuffle.indexOf(randomVideo), 1);
+
+					// Case 2: isShort && ignoreShorts => Failure
+				} else if (videoIsShort && configSync.shuffleIgnoreShortsOption == "2") {
 					console.log('A chosen video was a short, but shorts are ignored. Choosing a new random video.');
 
 					// Move the video to the knownShorts subdictionary
@@ -784,15 +802,44 @@ async function chooseRandomVideosFromPlaylist(playlistInfo, channelId, shouldUpd
 
 					// We need to decrement i, as we did not choose a video in this iteration
 					i--;
-				} else {
+
+					// Case 3: isShort && onlyShorts => Success
+				} else if (videoIsShort && configSync.shuffleIgnoreShortsOption == "0") {
+					// Move the video to the knownShorts subdictionary
+					playlistInfo["videos"]["knownShorts"][randomVideo] = playlistInfo["videos"]["unknownType"][randomVideo];
+					delete playlistInfo["videos"]["unknownType"][randomVideo];
+
+					// The video is a short, so add it to the list of chosen videos and remove it from the pool of videos to choose from
+					chosenVideos.push(randomVideo);
+					videosToShuffle.splice(videosToShuffle.indexOf(randomVideo), 1);
+
+					// Case 4: !isShort && onlyShorts => Failure
+				} else if (!videoIsShort && configSync.shuffleIgnoreShortsOption == "0") {
+					console.log('A chosen video was not a short, but only shorts should be shuffled. Choosing a new random video.');
+
 					// Move the video to the knownVideos subdictionary
 					playlistInfo["videos"]["knownVideos"][randomVideo] = playlistInfo["videos"]["unknownType"][randomVideo];
 					delete playlistInfo["videos"]["unknownType"][randomVideo];
 
-					// The video is not a short, so add it to the list of chosen videos and remove it from the pool of videos to choose from
-					chosenVideos.push(randomVideo);
+					// Remove the video from videosToShuffle to not choose it again
+					// Do not remove it from the playlistInfo object, as we do not want to delete it from the database
 					videosToShuffle.splice(videosToShuffle.indexOf(randomVideo), 1);
+
+					// We need to decrement i, as we did not choose a video in this iteration
+					i--;
+
+					/* c8 ignore start - This should never happen, but we want to test it anyway */
+				} else {
+					throw new RandomYoutubeVideoError(
+						{
+							code: "RYV-11B",
+							message: `An unknown error occurred while testing if the video ${randomVideo} should be included in the shuffle.`,
+							solveHint: "Please contact the developer, as this should not happen.",
+							showTrace: false
+						}
+					);
 				}
+				/* c8 ignore stop */
 			} else {
 				// Otherwise, the video must be a knownVideo, as we do not include knownShorts in allVideos
 				chosenVideos.push(randomVideo);
@@ -810,7 +857,7 @@ async function chooseRandomVideosFromPlaylist(playlistInfo, channelId, shouldUpd
 		throw new RandomYoutubeVideoError(
 			{
 				code: "RYV-6B",
-				message: "All previously uploaded videos on this channel were deleted (the channel does not have any uploads) or you are ignoring shorts and the channel has only uploaded shorts.",
+				message: "All previously uploaded videos on this channel were deleted (the channel does not have any uploads) or you are ignoring/only shuffling from shorts and the channel only has/has no shorts.",
 				solveHint: "If you are ignoring shorts, disable the option in the popup to shuffle from this channel.",
 				showTrace: false
 			}
@@ -832,7 +879,7 @@ function getVideoType(videoId, playlistInfo) {
 	/* c8 ignore start - This will only happen if we forget to implement something here, so we do not need to test it */
 	throw new RandomYoutubeVideoError(
 		{
-			code: "RYV-11",
+			code: "RYV-11A",
 			message: `The video that was tested does not exist in the local playlist ${videoId}, so it's type could not be found.`,
 			solveHint: "Please contact the developer, as this should not happen.",
 			showTrace: false
diff --git a/static/html/popup.html b/static/html/popup.html
index 57aa82b3..5027daf2 100644
--- a/static/html/popup.html
+++ b/static/html/popup.html
@@ -1,220 +1,237 @@
 <!DOCTYPE html>
 <html id="randomYoutubeVideoHTML" lang="en">
+	<head>
+		<title>Random YouTube Video</title>
+		<meta charset="UTF-8" />
+		<meta name="viewport" content="width=device-width, initial-scale=1" />
+		<link id="RandomYoutubeVideoStyleSheet" rel="stylesheet" href="../css/popup.css" />
+		<link id="RandomYoutubeVideoStyleSheet" rel="stylesheet" href="../css/toggle.css" />
+	</head>
+
+	<body id="randomYoutubeVideoBody" class="randomYoutubeVideoPopupBody">
+		<div id="randomYoutubeVideo">
+			<h1>Random YouTube Video</h1>
+
+			<!-- OPTIONS START -->
+			<!-- <h2>Extension Settings</h2> -->
+			<p class="grey-text">Hover over an option to view a more detailed explanation.</p>
+
+			<h3>General Video Settings</h3>
+			<!-- First row of options -->
+			<div class="optionsRow">
+				<!-- Shuffling: Open in new tab option toggle -->
+				<div class="toggle optionsRow-item">
+					<label
+						id="shuffleOpenInNewTabOption"
+						title="If this is enabled, shuffled videos will open in a new tab instead of the current one. This setting is ignored when using the shuffle button displayed in the popup, which will always open a new tab.">
+						Open in new tab
+						<input type="checkbox" id="shuffleOpenInNewTabOptionToggle" />
+						<span class="slider"></span>
+					</label>
+				</div>
 
-<head>
-	<title>Random YouTube Video</title>
-	<meta charset="UTF-8" />
-	<meta name="viewport" content="width=device-width, initial-scale=1" />
-	<link id="RandomYoutubeVideoStyleSheet" rel="stylesheet" href="../css/popup.css" />
-	<link id="RandomYoutubeVideoStyleSheet" rel="stylesheet" href="../css/toggle.css" />
-</head>
-
-<body id="randomYoutubeVideoBody" class="randomYoutubeVideoPopupBody">
-	<div id="randomYoutubeVideo">
-
-		<h1>Random YouTube Video</h1>
-
-		<!-- OPTIONS START -->
-		<!-- <h2>Extension Settings</h2> -->
-		<p class="grey-text">Hover over an option to view a more detailed explanation.</p>
-
-		<h3>General Video Settings</h3>
-		<!-- First row of options -->
-		<div class="optionsRow">
-
-			<!-- Shuffling: Open in new tab option toggle -->
-			<div class="toggle optionsRow-item">
-				<label id="shuffleOpenInNewTabOption"
-					title="If this is enabled, shuffled videos will open in a new tab instead of the current one. This setting is ignored when using the shuffle button displayed in the popup, which will always open a new tab.">
-					Open in new tab
-					<input type="checkbox" id="shuffleOpenInNewTabOptionToggle">
-					<span class="slider"></span>
-				</label>
-			</div>
-
-			<!-- Shuffling: Open in new tab option toggle -->
-			<div class="toggle optionsRow-item">
-				<label id="shuffleReUseNewTabOption"
-					title="If this is enabled, the first new tab opened by this extension when shuffling will be reused, as long as it is still on a youtube.com page.">
-					Reuse new tab
-					<input type="checkbox" id="shuffleReUseNewTabOptionToggle">
-					<span class="slider"></span>
-				</label>
-			</div>
-
-			<!-- Shuffling: Ignore shorts option toggle -->
-			<div class="toggle optionsRow-item">
-				<label id="shuffleIgnoreShortsOption"
-					title="If this is enabled, the extension will not choose shorts when shuffling.">
-					Ignore shorts
-					<input type="checkbox" id="shuffleIgnoreShortsOptionToggle">
-					<span class="slider"></span>
-				</label>
-			</div>
-
-		</div>
-		<!-- First row end -->
-
-		<!-- Second row of options -->
-		<div class="optionsRow">
+				<!-- Shuffling: Open in new tab option toggle -->
+				<div class="toggle optionsRow-item">
+					<label id="shuffleReUseNewTabOption" title="If this is enabled, the first new tab opened by this extension when shuffling will be reused, as long as it is still on a youtube.com page.">
+						Reuse new tab
+						<input type="checkbox" id="shuffleReUseNewTabOptionToggle" />
+						<span class="slider"></span>
+					</label>
+				</div>
 
-			<!-- Shuffling: Open as playlist option toggle -->
-			<div class="toggle optionsRow-item">
-				<label id="shuffleOpenAsPlaylistOption"
-					title="If this is enabled, shuffling will choose multiple videos and open a temporary playlist that contains these videos. Use the input field to the right to choose how many videos should be in that playlist.">
-					Open a playlist
-					<input type="checkbox" id="shuffleOpenAsPlaylistOptionToggle">
-					<span class="slider"></span>
-				</label>
+				<!-- Shuffling: Ignore shorts option toggle -->
+				<div class="optionsRow-item">
+					<div id="shuffleIgnoreShortsOptionDropdownDiv" class="optionTextInput" style="margin-top: -4px">
+						<p class="displayInline" title="Choose if the extension should shuffle from all videos uploaded on the channel, ignore shorts, or shuffle only from shorts.">Shorts handling</p>
+						<!-- Dropdown menu START -->
+						<select
+							id="shuffleIgnoreShortsOptionDropdown"
+							class="displayInline"
+							title="Choose if the extension should shuffle from all videos uploaded on the channel, ignore shorts, or shuffle only from shorts.">
+							<option value="1" title="The extension will include both shorts and normal videos in the shuffle.">Include shorts</option>
+							<option value="2" title="Shorts will be ignored when shuffling.">Ignore shorts</option>
+							<option value="0" title="The extension will only shuffle from shorts uploaded on channels (normal videos are ignored).">Only shorts</option>
+						</select>
+						<!-- Dropdown menu END -->
+					</div>
+				</div>
 			</div>
+			<!-- First row end -->
+
+			<!-- Second row of options -->
+			<div class="optionsRow">
+				<!-- Shuffling: Open as playlist option toggle -->
+				<div class="toggle optionsRow-item">
+					<label
+						id="shuffleOpenAsPlaylistOption"
+						title="If this is enabled, shuffling will choose multiple videos and open a temporary playlist that contains these videos. Use the input field to the right to choose how many videos should be in that playlist.">
+						Open a playlist
+						<input type="checkbox" id="shuffleOpenAsPlaylistOptionToggle" />
+						<span class="slider"></span>
+					</label>
+				</div>
 
-			<!-- Shuffling: Open as playlist number of videos input -->
-			<div id="shuffleNumVideosInPlaylistDiv" class="optionsRow-item optionTextInput"
-				title="Choose how many videos should be in the playlist when shuffling. YouTube limits the number of videos in this playlist type to 50. With higher values the shuffle may take slightly longer than usual.">
-				<p>Videos in playlist:</p>
-				<input type="number" inputmode="numeric" class="numberInput" max="50" min="1"
-					id="shuffleNumVideosInPlaylistInput" name="shuffleNumVideosInPlaylistInput" value="5">
+				<!-- Shuffling: Open as playlist number of videos input -->
+				<div
+					id="shuffleNumVideosInPlaylistDiv"
+					class="optionsRow-item optionTextInput"
+					title="Choose how many videos should be in the playlist when shuffling. YouTube limits the number of videos in this playlist type to 50. With higher values the shuffle may take slightly longer than usual.">
+					<p>Videos in playlist:</p>
+					<input type="number" inputmode="numeric" class="numberInput" max="50" min="1" id="shuffleNumVideosInPlaylistInput" name="shuffleNumVideosInPlaylistInput" value="5" />
+				</div>
 			</div>
-
-		</div>
-		<!-- Second row end -->
-
-		<!-- Settings for the most recently visited channel -->
-		<div id="channel">
-			<div id="channelCustomOptionsDiv" class="hidden">
-				<h3 id="channelCustomOptionsHeader">Channel settings</h3>
-				<p class="grey-text">Customize your most recently visited channel.</p>
-				<!-- Custom options per channel: Choose option from dropdown -->
-				<div id="channelCustomOptionsDropdownDiv" class="optionTextInput" style="margin-top: 8px;">
-					<p class="displayInline"
-						title="Choose from one of the provided options in the dropdown to customize your shuffling experience on this channel.">
-						Shuffle from</p>
-					<!-- Dropdown menu START -->
-					<select id="channelCustomOptionsDropdown" class="displayInline"
-						title="Choose from one of the provided options in the dropdown to customize your shuffling experience on this channel.">
-						<option value="allVideosOption" option-width="190px"
-							title="No filters are applied, and a random video from all uploaded videos will be chosen.">
-							all videos on this channel.</option>
-						<option value="dateOption" option-width="205px"
-							title="Only videos uploaded on or after the chosen date will be considered when shuffling.">
-							videos uploaded since date:</option>
-						<option value="videoIdOption" option-width="190px"
-							title="Only videos uploaded on or after the day the video with the given ID was uploaded will be considered when shuffling.">
-							videos after video with ID:</option>
-						<option value="percentageOption" option-width="206px"
-							title="Only the most recent X% of videos uploaded to the channel will be considered when shuffling.">
-							the most recent % of videos:</option>
-					</select>
-					<!-- Dropdown menu END -->
-					<!-- Input fields per option START -->
-					<input type="date" class="hidden dateInput" id="channelCustomOptionsDateOptionInput"
-						name="channelCustomOptionsDateOptionInput"
-						title="Only videos uploaded on or after the chosen date will be considered when shuffling.">
-					<input type="text" inputmode="text" class="hidden youtubeIdInput" maxlength="11"
-						id="channelCustomOptionsVideoIdOptionInput" name="channelCustomOptionsVideoIdOptionInput"
-						title="Only videos uploaded on or after the day the video with the given ID was uploaded will be considered when shuffling."
-						placeholder="Enter Video ID">
-					<input type="number" inputmode="numeric" class="hidden displayInline numberInput noArrows" max="100" min="1"
-						id="channelCustomOptionsPercentageOptionInput" name="channelCustomOptionsPercentageOptionInput"
-						title="Only the most recent X% of videos uploaded to the channel will be considered when shuffling.">
-					<p id="channelCustomOptionsPercentageOptionP" class="hidden displayInline"
-						title="Only the most recent X% of videos uploaded to the channel will be considered when shuffling.">%</p>
-					<!-- Input fields per option END -->
+			<!-- Second row end -->
+
+			<!-- Settings for the most recently visited channel -->
+			<div id="channel">
+				<div id="channelCustomOptionsDiv" class="hidden">
+					<h3 id="channelCustomOptionsHeader">Channel settings</h3>
+					<p class="grey-text">Customize your most recently visited channel.</p>
+					<!-- Custom options per channel: Choose option from dropdown -->
+					<div id="channelCustomOptionsDropdownDiv" class="optionTextInput" style="margin-top: 8px">
+						<p class="displayInline" title="Choose from one of the provided options in the dropdown to customize your shuffling experience on this channel.">Shuffle from</p>
+						<!-- Dropdown menu START -->
+						<select id="channelCustomOptionsDropdown" class="displayInline" title="Choose from one of the provided options in the dropdown to customize your shuffling experience on this channel.">
+							<option value="allVideosOption" option-width="190px" title="No filters are applied, and a random video from all uploaded videos will be chosen.">all videos on this channel.</option>
+							<option value="dateOption" option-width="205px" title="Only videos uploaded on or after the chosen date will be considered when shuffling.">videos uploaded since date:</option>
+							<option value="videoIdOption" option-width="190px" title="Only videos uploaded on or after the day the video with the given ID was uploaded will be considered when shuffling.">
+								videos after video with ID:
+							</option>
+							<option value="percentageOption" option-width="206px" title="Only the most recent X% of videos uploaded to the channel will be considered when shuffling.">
+								the most recent % of videos:
+							</option>
+						</select>
+						<!-- Dropdown menu END -->
+						<!-- Input fields per option START -->
+						<input
+							type="date"
+							class="hidden dateInput"
+							id="channelCustomOptionsDateOptionInput"
+							name="channelCustomOptionsDateOptionInput"
+							title="Only videos uploaded on or after the chosen date will be considered when shuffling." />
+						<input
+							type="text"
+							inputmode="text"
+							class="hidden youtubeIdInput"
+							maxlength="11"
+							id="channelCustomOptionsVideoIdOptionInput"
+							name="channelCustomOptionsVideoIdOptionInput"
+							title="Only videos uploaded on or after the day the video with the given ID was uploaded will be considered when shuffling."
+							placeholder="Enter Video ID" />
+						<input
+							type="number"
+							inputmode="numeric"
+							class="hidden displayInline numberInput noArrows"
+							max="100"
+							min="1"
+							id="channelCustomOptionsPercentageOptionInput"
+							name="channelCustomOptionsPercentageOptionInput"
+							title="Only the most recent X% of videos uploaded to the channel will be considered when shuffling." />
+						<p id="channelCustomOptionsPercentageOptionP" class="hidden displayInline" title="Only the most recent X% of videos uploaded to the channel will be considered when shuffling.">%</p>
+						<!-- Input fields per option END -->
+					</div>
+					<!-- Shuffle button -->
+					<button id="popupShuffleButton" class="randomYoutubeVideoButton shuffleButton">Shuffle from this channel</button>
 				</div>
-				<!-- Shuffle button -->
-				<button id="popupShuffleButton" class="randomYoutubeVideoButton shuffleButton">
-					Shuffle from this channel</button>
 			</div>
-		</div>
 
-		<h3>Advanced Settings</h3>
-		<!-- Custom API key: Option toggle -->
-		<div class="optionsRow">
-			<div class="toggle optionsRow-item">
-				<label id="useCustomApiKeyOption"
-					title="Your custom API key will only be stored locally and not shared with anyone! Using your own YouTube API key gives you more control over the usage of the extension. Enter your API key in the corresponding field below after enabling this option. This also enables you to opt out of sharing video id's with other users through the database. Unsure how to get an API key? Follow the official documentation: https://developers.google.com/youtube/v3/getting-started">
-					Use custom API key
-					<input type="checkbox" id="useCustomApiKeyOptionToggle">
-					<span class="slider"></span>
-				</label>
-			</div>
+			<h3>Advanced Settings</h3>
+			<!-- Custom API key: Option toggle -->
+			<div class="optionsRow">
+				<div class="toggle optionsRow-item">
+					<label
+						id="useCustomApiKeyOption"
+						title="Your custom API key will only be stored locally and not shared with anyone! Using your own YouTube API key gives you more control over the usage of the extension. Enter your API key in the corresponding field below after enabling this option. This also enables you to opt out of sharing video id's with other users through the database. Unsure how to get an API key? Follow the official documentation: https://developers.google.com/youtube/v3/getting-started">
+						Use custom API key
+						<input type="checkbox" id="useCustomApiKeyOptionToggle" />
+						<span class="slider"></span>
+					</label>
+				</div>
 
-			<!-- Database sharing: Option toggle -->
-			<div class="toggle optionsRow-item">
-				<label id="dbSharingOption"
-					title="Can be disabled if a custom API key is provided. By opting out of database sharing, the video ID's of channels you visit will not be shared to the database. However, you will also not be able to access video id's uploaded to the database by other users. Video id's will still be stored locally. When opting back in to sharing, you will regain access to the database and locally stored video id's may be shared with other users.">
-					Database sharing
-					<input type="checkbox" id="dbSharingOptionToggle">
-					<span class="slider"></span>
-				</label>
+				<!-- Database sharing: Option toggle -->
+				<div class="toggle optionsRow-item">
+					<label
+						id="dbSharingOption"
+						title="Can be disabled if a custom API key is provided. By opting out of database sharing, the video ID's of channels you visit will not be shared to the database. However, you will also not be able to access video id's uploaded to the database by other users. Video id's will still be stored locally. When opting back in to sharing, you will regain access to the database and locally stored video id's may be shared with other users.">
+						Database sharing
+						<input type="checkbox" id="dbSharingOptionToggle" />
+						<span class="slider"></span>
+					</label>
+				</div>
 			</div>
-		</div>
 
-		<!-- Custom API key: Input -->
-		<div id="customApiKeyInputDiv" class="optionTextInput hidden">
-			<!-- Learn how to get an API key -->
-			<div id="customApiKeyHowToGetDiv">
-				<p class="grey-text displayInline">Follow the</p>
-				<a class="whiteGreyLink displayInline" href="https://developers.google.com/youtube/v3/getting-started"
-					target="_blank" rel="noopener">official guide</a>
-				<p class="grey-text displayInline">to learn how to get an API key.</p>
-			</div>
+			<!-- Custom API key: Input -->
+			<div id="customApiKeyInputDiv" class="optionTextInput hidden">
+				<!-- Learn how to get an API key -->
+				<div id="customApiKeyHowToGetDiv">
+					<p class="grey-text displayInline">Follow the</p>
+					<a class="whiteGreyLink displayInline" href="https://developers.google.com/youtube/v3/getting-started" target="_blank" rel="noopener">official guide</a>
+					<p class="grey-text displayInline">to learn how to get an API key.</p>
+				</div>
 
-			<p style="margin-top: 6px;">Your custom API key:</p>
-			<input type="text" id="customApiKeyInputField" name="customApiKeyInputField" style="width: 80%;"
-				title="Enter your YouTube API key here. It will not be shared with anyone."
-				placeholder="Enter API key here. It won't be shared with anyone.">
-			<br>
-			<button class="randomYoutubeVideoButton" id="customApiKeySubmitButton" type="button">Submit</button>
-			<div id="customApiKeyInputInfoDiv" class="hidden">
-				<p id="customApiKeyInputInfoText"></p>
+				<p style="margin-top: 6px">Your custom API key:</p>
+				<input
+					type="text"
+					id="customApiKeyInputField"
+					name="customApiKeyInputField"
+					style="width: 80%"
+					title="Enter your YouTube API key here. It will not be shared with anyone."
+					placeholder="Enter API key here. It won't be shared with anyone." />
+				<br />
+				<button class="randomYoutubeVideoButton" id="customApiKeySubmitButton" type="button">Submit</button>
+				<div id="customApiKeyInputInfoDiv" class="hidden">
+					<p id="customApiKeyInputInfoText"></p>
+				</div>
 			</div>
-		</div>
-		<!-- OPTIONS END -->
-
-		<!-- FYI -->
-		<div id="forYourInformationDiv">
-			<!-- Number of shuffled videos -->
-			<p id="numberOfShuffledVideosText" style="margin-bottom: 6px; margin-top: 6px;">You have shuffled 0 times until
-				now.</p>
-			<!-- Daily quota notice -->
-			<div id="dailyQuotaNoticeDiv" class="hidden"
-				title="To protect the userbase against abuse, each user has a limited amount of requests to the YouTube API per day. This quota only ticks down if you are the first to shuffle from a channel, and should not effect users with normal usage patterns. If you are affected by this, you may make use of the custom API key option to remove this limitation.">
-				<p class="displayInline">You have</p>
-				<p class="displayInline" id="dailyQuotaNoticeText">200</p>
-				<p class="displayInline">requests to the YouTube API remaining today.<br>Use a custom API key to remove this
-					limit.</p>
+			<!-- OPTIONS END -->
+
+			<!-- FYI -->
+			<div id="forYourInformationDiv">
+				<!-- Number of shuffled videos -->
+				<p id="numberOfShuffledVideosText" style="margin-bottom: 6px; margin-top: 6px">You have shuffled 0 times until now.</p>
+				<!-- Daily quota notice -->
+				<div
+					id="dailyQuotaNoticeDiv"
+					class="hidden"
+					title="To protect the userbase against abuse, each user has a limited amount of requests to the YouTube API per day. This quota only ticks down if you are the first to shuffle from a channel, and should not effect users with normal usage patterns. If you are affected by this, you may make use of the custom API key option to remove this limitation.">
+					<p class="displayInline">You have</p>
+					<p class="displayInline" id="dailyQuotaNoticeText">200</p>
+					<p class="displayInline">requests to the YouTube API remaining today.<br />Use a custom API key to remove this limit.</p>
+				</div>
+				<!-- Daily quota notice end -->
 			</div>
-			<!-- Daily quota notice end -->
+			<!-- FYI end -->
+
+			<footer id="randomYoutubeVideoFooter">
+				Leave a review:
+				<a
+					class="footerLink"
+					href="https://chrome.google.com/webstore/detail/random-youtube-video/kijgnjhogkjodpakfmhgleobifempckf"
+					target="_blank"
+					rel="noopener"
+					title="Leave a review on the Chrome Web Store"
+					>Chrome</a
+				>
+				<a class="footerLink" href="https://addons.mozilla.org/en-GB/firefox/addon/random-youtube-video/" target="_blank" rel="noopener" title="Leave a review on the Mozilla Add-Ons page">Firefox</a>
+				<a
+					class="footerLink"
+					href="https://microsoftedge.microsoft.com/addons/detail/random-youtube-video/fccfflipicelkilpmgniblpoflkbhdbe"
+					target="_blank"
+					rel="noopener"
+					title="Leave a review on the Edge Add-Ons page"
+					>Edge</a
+				>
+				<br />
+				<a class="footerLink" href="https://github.com/NikkelM/Random-YouTube-Video" target="_blank" rel="noopener" title="View the source code or get into contact with the developer">GitHub</a>
+				<button class="randomYoutubeVideoButton" id="viewChangelogButton" type="button" title="View the latest changes to the extension">Changelog</button>
+				<a class="footerLink" href="https://ko-fi.com/nikkelm" target="_blank" rel="noopener" title="Show your appreciation and support the development of the extension">Donate</a>
+			</footer>
 		</div>
-		<!-- FYI end -->
-
-		<footer id="randomYoutubeVideoFooter">
-			Leave a review:
-			<a class="footerLink"
-				href="https://chrome.google.com/webstore/detail/random-youtube-video/kijgnjhogkjodpakfmhgleobifempckf"
-				target="_blank" rel="noopener" title="Leave a review on the Chrome Web Store">Chrome</a>
-			<a class="footerLink" href="https://addons.mozilla.org/en-GB/firefox/addon/random-youtube-video/" target="_blank"
-				rel="noopener" title="Leave a review on the Mozilla Add-Ons page">Firefox</a>
-			<a class="footerLink"
-				href="https://microsoftedge.microsoft.com/addons/detail/random-youtube-video/fccfflipicelkilpmgniblpoflkbhdbe"
-				target="_blank" rel="noopener" title="Leave a review on the Edge Add-Ons page">Edge</a>
-			<br>
-			<a class="footerLink" href="https://github.com/NikkelM/Random-YouTube-Video" target="_blank" rel="noopener"
-				title="View the source code or get into contact with the developer">GitHub</a>
-			<button class="randomYoutubeVideoButton" id="viewChangelogButton" type="button"
-				title="View the latest changes to the extension">Changelog</button>
-			<a class="footerLink" href="https://ko-fi.com/nikkelm" target="_blank" rel="noopener"
-				title="Show your appreciation and support the development of the extension">Donate</a>
-		</footer>
-
-	</div>
-
-	<script src="../utils.js" type="text/javascript"></script>
-	<script src="../shuffleVideo.js" type="text/javascript"></script>
-	<script src="../htmlUtils.js" type="text/javascript"></script>
-	<script src="../popupUtils.js" type="text/javascript"></script>
-	<script src="../popup.js" type="module"></script>
-</body>
 
-</html>
\ No newline at end of file
+		<script src="../utils.js" type="text/javascript"></script>
+		<script src="../shuffleVideo.js" type="text/javascript"></script>
+		<script src="../htmlUtils.js" type="text/javascript"></script>
+		<script src="../popupUtils.js" type="text/javascript"></script>
+		<script src="../popup.js" type="module"></script>
+	</body>
+</html>
diff --git a/test/playlistPermutations.js b/test/playlistPermutations.js
index fb2c448a..e598837c 100644
--- a/test/playlistPermutations.js
+++ b/test/playlistPermutations.js
@@ -56,8 +56,9 @@ const configSyncModifiers = [
 	],
 	// shuffleIgnoreShortsOption
 	[
-		true,
-		false
+		"0",
+		"1",
+		"2"
 	],
 	// shuffleOpenAsPlaylistOption
 	[
@@ -214,11 +215,13 @@ const playlistModifiers = [
 		'LocalPlaylistRecentlyAccessed',
 		'LocalPlaylistNotRecentlyAccessed'
 	],
-	// containsDeletedVideos: If the local playlist should contain deleted videos
+	// containsDeletedVideos: If the local playlist should contain deleted videos, and if shorts are present
+	// The first two items imply that both videos and shorts are present
 	[
 		'LocalPlaylistContainsDeletedVideos',
 		'LocalPlaylistContainsNoDeletedVideos',
-		'LocalPlaylistContainsOnlyShorts'
+		'LocalPlaylistContainsOnlyShorts',
+		'LocalPlaylistContainsNoShorts'
 	],
 	// newUploadedVideos: If a new video has since been uploaded
 	[
@@ -243,18 +246,18 @@ const playlistModifiers = [
 const defaultLocalShorts = {
 	"LOC_S_00001": threeDaysAgo.substring(0, 10),
 	"LOC_S_00002": daysAgo(4).substring(0, 10),
-	"LOC_S_00003": daysAgo(5).substring(0, 10),
+	"LOC_S_00003": daysAgo(10).substring(0, 10),
 	"LOC_S_00004": sixDaysAgo.substring(0, 10),
-	"LOC_S_00005": daysAgo(7).substring(0, 10),
+	"LOC_S_00005": daysAgo(12).substring(0, 10),
 };
 
-const defaultLocalVideos = Object.assign({}, defaultLocalShorts, {
-	"LOC_V_00006": daysAgo(8).substring(0, 10),
-	"LOC_V_00007": daysAgo(9).substring(0, 10),
+const defaultLocalVideos = {
+	"LOC_V_00006": threeDaysAgo.substring(0, 10),
+	"LOC_V_00007": daysAgo(4).substring(0, 10),
 	"LOC_V_00008": daysAgo(10).substring(0, 10),
-	"LOC_V_00009": daysAgo(11).substring(0, 10),
+	"LOC_V_00009": sixDaysAgo.substring(0, 10),
 	"LOC_V_00010": daysAgo(12).substring(0, 10),
-});
+};
 
 const defaultLocalDeletedVideos = {
 	"DEL_LOC_S_1": fourteenDaysAgo.substring(0, 10),
@@ -322,10 +325,10 @@ for (let i = 0; i < playlistModifiers[0].length; i++) {
 								|| playlistModifiers[2][k] !== "LocalPlaylistRecentlyAccessed" || playlistModifiers[5][n] !== "DBContainsNoVideosNotInLocalPlaylist")) {
 								continue;
 							}
-							// If the local playlist does not exist, it cannot contain deleted videos, only shorts, have been updated from the DB recently, or have sorted videos into types
+							// If the local playlist does not exist, it cannot contain deleted videos, only shorts, no shorts, have been updated from the DB recently, or have sorted videos into types
 							if ((playlistModifiers[2][k] === "LocalPlaylistDoesNotExist") && (playlistModifiers[3][l] === "LocalPlaylistContainsDeletedVideos"
-								|| playlistModifiers[3][l] === "LocalPlaylistContainsOnlyShorts" || playlistModifiers[0][i] === "LocalPlaylistFetchedDBRecently"
-								|| playlistModifiers[6][o] === "LocalPlaylistContainsKnownShortsAndVideos")) {
+								|| playlistModifiers[3][l] === "LocalPlaylistContainsOnlyShorts" || playlistModifiers[3][l] === "LocalPlaylistContainsNoShorts"
+								|| playlistModifiers[0][i] === "LocalPlaylistFetchedDBRecently" || playlistModifiers[6][o] === "LocalPlaylistContainsKnownShortsAndVideos")) {
 								continue;
 							}
 							// If the DB entry does not exist, it cannot contain videos not in the local playlist
@@ -348,6 +351,17 @@ for (let i = 0; i < playlistModifiers[0].length; i++) {
 									continue;
 								}
 							}
+							// We also only need one permutation that has no shorts saved locally, which is
+							// UU_LocalPlaylistFetchedDBRecently_DBEntryIsUpToDate_LocalPlaylistRecentlyAccessed_LocalPlaylistContainsNoShorts_NoNewVideoUploaded_DBContainsNoVideosNotInLocalPlaylist_LocalPlaylistContainsOnlyUnknownVideos
+							// This is because the other permutations are covered by the other tests
+							if (playlistModifiers[3][l] === "LocalPlaylistContainsNoShorts") {
+								// Discard all permutations that are not the one described above
+								if (playlistModifiers[0][i] !== "LocalPlaylistFetchedDBRecently" || playlistModifiers[1][j] !== "DBEntryIsUpToDate"
+									|| playlistModifiers[2][k] !== "LocalPlaylistRecentlyAccessed" || playlistModifiers[4][m] !== "NoNewVideoUploaded"
+									|| playlistModifiers[5][n] !== "DBContainsNoVideosNotInLocalPlaylist" || playlistModifiers[6][o] !== "LocalPlaylistContainsOnlyUnknownVideos") {
+									continue;
+								}
+							}
 
 							// The playlist ID always exists
 							playlistId = (`UU_${playlistModifiers[0][i]}_${playlistModifiers[1][j]}_${playlistModifiers[2][k]}_${playlistModifiers[3][l]}_${playlistModifiers[4][m]}_${playlistModifiers[5][n]}_${playlistModifiers[6][o]}`);
@@ -390,10 +404,10 @@ for (let i = 0; i < playlistModifiers[0].length; i++) {
 							localLastVideoPublishedAt = threeDaysAgo.slice(0, 19) + 'Z';
 
 							if (playlistModifiers[3][l] === "LocalPlaylistContainsDeletedVideos") {
-								localVideos = deepCopy(defaultLocalVideos);
+								localVideos = deepCopy({ ...defaultLocalVideos, ...defaultLocalShorts });
 								localDeletedVideos = deepCopy(defaultLocalDeletedVideos);
 							} else if (playlistModifiers[3][l] === "LocalPlaylistContainsNoDeletedVideos") {
-								localVideos = deepCopy(defaultLocalVideos);
+								localVideos = deepCopy({ ...defaultLocalVideos, ...defaultLocalShorts });
 								localDeletedVideos = null;
 							} else if (playlistModifiers[2][k] === "LocalPlaylistDoesNotExist") {
 								localVideos = null;
@@ -401,23 +415,30 @@ for (let i = 0; i < playlistModifiers[0].length; i++) {
 							} else if (playlistModifiers[3][l] === "LocalPlaylistContainsOnlyShorts") {
 								localVideos = deepCopy(defaultLocalShorts);
 								localDeletedVideos = null;
+							} else if (playlistModifiers[3][l] === "LocalPlaylistContainsNoShorts") {
+								localVideos = deepCopy(defaultLocalVideos);
+								localDeletedVideos = null;
 							} else {
 								throw new Error(`Invalid playlist modifier combination: ${playlistModifiers[3][l]}`);
 							}
 
 							// Does the db contain videos unknown to the local playlist
+							if (playlistModifiers[3][l] === "LocalPlaylistContainsOnlyShorts") {
+								dbVideos = deepCopy(defaultLocalShorts);
+							} else if (playlistModifiers[3][l] === "LocalPlaylistContainsNoShorts") {
+								dbVideos = deepCopy(defaultLocalVideos);
+							} else {
+								dbVideos = deepCopy({ ...defaultLocalVideos, ...defaultLocalShorts });
+							}
+
 							if (playlistModifiers[5][n] === "DBContainsVideosNotInLocalPlaylist") {
-								dbVideos = deepCopy({ ...defaultLocalVideos, ...defaultDBVideos });
+								dbVideos = deepCopy({ ...dbVideos, ...defaultDBVideos });
 								dbDeletedVideos = null;
 								dbLastVideoPublishedAt = twoDaysAgo.slice(0, 19) + 'Z';
 							} else if (playlistModifiers[5][n] === "DBContainsNoVideosNotInLocalPlaylist") {
-								dbVideos = playlistModifiers[3][l] === "LocalPlaylistContainsOnlyShorts"
-									? deepCopy(defaultLocalShorts)
-									: deepCopy(defaultLocalVideos);
 								dbDeletedVideos = null;
 								dbLastVideoPublishedAt = localLastVideoPublishedAt;
 							} else if (playlistModifiers[5][n] === "DBContainsDeletedVideos") {
-								dbVideos = deepCopy(defaultLocalVideos);
 								dbDeletedVideos = deepCopy(defaultDBDeletedVideos);
 								dbLastVideoPublishedAt = localLastVideoPublishedAt;
 							} else {
diff --git a/test/shuffleVideo.test.js b/test/shuffleVideo.test.js
index 200ec428..4a254f9e 100644
--- a/test/shuffleVideo.test.js
+++ b/test/shuffleVideo.test.js
@@ -499,6 +499,8 @@ describe('shuffleVideo', function () {
 				deepCopy(playlistPermutations.find((playlist) => playlist.playlistId === 'UU_LocalPlaylistDidNotFetchDBRecently_DBEntryIsNotUpToDate_LocalPlaylistNotRecentlyAccessed_LocalPlaylistContainsNoDeletedVideos_MultipleNewVideosUploaded_DBContainsNoVideosNotInLocalPlaylist_LocalPlaylistContainsKnownShortsAndVideos')),
 				// Playlist that only has shorts saved locally
 				deepCopy(playlistPermutations.find((playlist) => playlist.playlistId === 'UU_LocalPlaylistFetchedDBRecently_DBEntryIsUpToDate_LocalPlaylistRecentlyAccessed_LocalPlaylistContainsOnlyShorts_NoNewVideoUploaded_DBContainsNoVideosNotInLocalPlaylist_LocalPlaylistContainsOnlyUnknownVideos')),
+				// Playlist that has no shorts saved locally
+				deepCopy(playlistPermutations.find((playlist) => playlist.playlistId === 'UU_LocalPlaylistFetchedDBRecently_DBEntryIsUpToDate_LocalPlaylistRecentlyAccessed_LocalPlaylistContainsNoShorts_NoNewVideoUploaded_DBContainsNoVideosNotInLocalPlaylist_LocalPlaylistContainsOnlyUnknownVideos')),
 			];
 			setupChannelSettings(configSyncPermutations.channelSettingsPermutations, playlists);
 
@@ -735,7 +737,8 @@ describe('shuffleVideo', function () {
 											});
 										}
 									} else if (key === 'ignoreShortsPermutations') {
-										if (config.shuffleIgnoreShortsOption) {
+										// 0 = only shorts, 1 = no option set (shorts are included), 2 = ignore shorts
+										if (config.shuffleIgnoreShortsOption == "2") {
 											if (input.playlistId.includes('LocalPlaylistContainsOnlyShorts')) {
 												it('should throw an error if the playlist only contains shorts', async function () {
 													try {
@@ -744,7 +747,7 @@ describe('shuffleVideo', function () {
 													catch (error) {
 														expect(error).to.be.a(RandomYoutubeVideoError);
 														expect(error.code).to.be('RYV-6B');
-														expect(error.message).to.be('All previously uploaded videos on this channel were deleted (the channel does not have any uploads) or you are ignoring shorts and the channel has only uploaded shorts.');
+														expect(error.message).to.be('All previously uploaded videos on this channel were deleted (the channel does not have any uploads) or you are ignoring/only shuffling from shorts and the channel only has/has no shorts.');
 
 														return;
 													}
@@ -757,6 +760,39 @@ describe('shuffleVideo', function () {
 													expect(windowOpenStub.args[0][0]).to.not.contain('_S_');
 												});
 											}
+										} else if (config.shuffleIgnoreShortsOption == "0") {
+											if (input.playlistId.includes('LocalPlaylistContainsNoShorts')) {
+												it('should throw an error if the playlist contains no shorts', async function () {
+													try {
+														await chooseRandomVideo(input.channelId, false, domElement);
+													}
+													catch (error) {
+														expect(error).to.be.a(RandomYoutubeVideoError);
+														expect(error.code).to.be('RYV-6B');
+														expect(error.message).to.be('All previously uploaded videos on this channel were deleted (the channel does not have any uploads) or you are ignoring/only shuffling from shorts and the channel only has/has no shorts.');
+
+														return;
+													}
+													expect().fail("No error was thrown");
+												});
+											} else {
+												it('should only choose shorts', async function () {
+													await chooseRandomVideo(input.channelId, false, domElement);
+
+													expect(windowOpenStub.args[0][0]).to.not.contain('_V_');
+												});
+											}
+										} else if (config.shuffleIgnoreShortsOption == "1") {
+											if (!input.playlistId.includes('LocalPlaylistContainsNoShorts') && !input.playlistId.includes('LocalPlaylistContainsOnlyShorts')) {
+												// This works because we choose more videos than there are only videos OR shorts in the playlist, so there will always be one of each
+												// If this suddenly starts failing, it may be that that assumption was changed
+												it('should be able to choose both shorts and videos', async function () {
+													await chooseRandomVideo(input.channelId, false, domElement);
+
+													expect(windowOpenStub.args[0][0]).to.contain('_V_');
+													expect(windowOpenStub.args[0][0]).to.contain('_S_');
+												});
+											}
 										}
 									} else if (key === 'channelSettingsPermutations') {
 										// The percentageOption uses 100 as the default, and the allVideosOption has no value that can be set, so no error will be thrown
@@ -786,7 +822,7 @@ describe('shuffleVideo', function () {
 												}
 												expect().fail("No error was thrown");
 											});
-										} else {
+										} else if (!(input.playlistId.includes('LocalPlaylistContainsNoShorts') && config.channelSettings[input.channelId].activeOption === 'videoIdOption')) {
 											it('should apply the correct filter', async function () {
 												// The videos onto which the filter is applied includes the deleted videos (this changes the result e.g. for the percentageOption)
 												let filteredVideos = deepCopy({ ...input.dbVideos, ...input.dbDeletedVideos, ...input.localVideos, ...input.localDeletedVideos, ...input.newUploadedVideos });