diff --git a/obs/window-basic-main.cpp b/obs/window-basic-main.cpp
index cab17394d..9afbb7a9b 100644
--- a/obs/window-basic-main.cpp
+++ b/obs/window-basic-main.cpp
@@ -511,6 +511,8 @@ void OBSBasic::OBSInit()
 
 	Load(savePath);
 	ResetAudioDevices();
+
+	loaded = true;
 }
 
 OBSBasic::~OBSBasic()
@@ -579,6 +581,14 @@ void OBSBasic::InsertSceneItem(obs_sceneitem_t item)
 			QVariant::fromValue(OBSSceneItem(item)));
 
 	ui->sources->insertItem(0, listItem);
+	ui->sources->setCurrentRow(0);
+
+	/* if the source was just created, open properties dialog */
+	if (sourceSceneRefs[source] == 0 && loaded) {
+		delete properties;
+		properties = new OBSBasicProperties(this, source);
+		properties->Init();
+	}
 }
 
 /* Qt callbacks for invokeMethod */
diff --git a/obs/window-basic-main.hpp b/obs/window-basic-main.hpp
index 542673ec2..7e2b3c3d6 100644
--- a/obs/window-basic-main.hpp
+++ b/obs/window-basic-main.hpp
@@ -53,6 +53,8 @@ private:
 
 	std::vector<VolControl*> volumes;
 
+	bool loaded = false;
+
 	QPointer<OBSBasicProperties> properties;
 	QPointer<OBSBasicTransform> transformWindow;