diff --git a/advanced-scene-switcher.cpp b/advanced-scene-switcher.cpp
index c933a911..be18dc61 100644
--- a/advanced-scene-switcher.cpp
+++ b/advanced-scene-switcher.cpp
@@ -1069,6 +1069,7 @@ void SwitcherData::Thread()
 					if (currentSource == currentSource2){
 						obs_frontend_set_current_scene(source);
 						obs_source_release(source);
+						obs_source_release(currentSource2);
 						obs_weak_source_release(ws);
 						break;
 					}
@@ -1142,14 +1143,14 @@ void SwitcherData::Thread()
 					}
 				}
 
+				match = match && (!fullscreen || (fullscreen && isFullscreen()));
+
 				if (!match && switchIfNotMatching &&
 					nonMatchingScene && !ignoreWindow) {
 					match = true;
 					scene = nonMatchingScene;
 				}
 
-				match = match && (!fullscreen || (fullscreen && isFullscreen()));
-
 				if (match) {
 					obs_source_t *source =
 						obs_weak_source_get_source(scene);