diff --git a/UI/window-basic-settings-stream.cpp b/UI/window-basic-settings-stream.cpp
index f6e0817a0..e167e31be 100644
--- a/UI/window-basic-settings-stream.cpp
+++ b/UI/window-basic-settings-stream.cpp
@@ -1546,9 +1546,7 @@ void OBSBasicSettings::ResetEncoders(bool streamOnly)
 
 	if (!streamOnly) {
 		ui->advOutRecEncoder->clear();
-		ui->advOutRecEncoder->addItem(TEXT_USE_STREAM_ENC, "none");
 		ui->advOutRecAEncoder->clear();
-		ui->advOutRecAEncoder->addItem(TEXT_USE_STREAM_ENC, "none");
 	}
 
 	/* ------------------------------------------------- */
@@ -1580,6 +1578,18 @@ void OBSBasicSettings::ResetEncoders(bool streamOnly)
 		}
 	}
 
+	ui->advOutEncoder->model()->sort(0);
+	ui->advOutAEncoder->model()->sort(0);
+
+	if (!streamOnly) {
+		ui->advOutRecEncoder->model()->sort(0);
+		ui->advOutRecEncoder->insertItem(0, TEXT_USE_STREAM_ENC,
+						 "none");
+		ui->advOutRecAEncoder->model()->sort(0);
+		ui->advOutRecAEncoder->insertItem(0, TEXT_USE_STREAM_ENC,
+						  "none");
+	}
+
 	/* ------------------------------------------------- */
 	/* load simple stream encoders                       */