diff --git a/src/raddbg/raddbg_core.c b/src/raddbg/raddbg_core.c
index c7669aa2..d249db60 100644
--- a/src/raddbg/raddbg_core.c
+++ b/src/raddbg/raddbg_core.c
@@ -16357,7 +16357,7 @@ rd_frame(void)
     ////////////////////////////
     //- rjf: no selected thread? -> try to snap to any existing thread
     //
-    if(ctrl_entity_from_handle(d_state->ctrl_entity_store, rd_base_regs()->thread) == &ctrl_entity_nil)
+    if(!d_ctrl_targets_running() && ctrl_entity_from_handle(d_state->ctrl_entity_store, rd_base_regs()->thread) == &ctrl_entity_nil)
     {
       CTRL_Entity *process = ctrl_entity_from_handle(d_state->ctrl_entity_store, rd_base_regs()->process);
       if(process == &ctrl_entity_nil)
diff --git a/src/raddbg/raddbg_main.c b/src/raddbg/raddbg_main.c
index 77f32960..ba542ced 100644
--- a/src/raddbg/raddbg_main.c
+++ b/src/raddbg/raddbg_main.c
@@ -6,7 +6,6 @@
 //
 // [ ] fix quote input in quoteless watch window value editors
 //
-// [ ] per-target stdout/stderr file output paths
 //
 // [ ] double click on breakpoints/watch-pins/etc. to go to location
 // [ ] auto view rule templates (?)
@@ -533,6 +532,7 @@
 // [x] post-@msgs TODOs:
 // [x] ensure the following issues are resolved with this new pass:
 //  [x] debugger readme pass
+// [x] per-target stdout/stderr file output paths
 
 ////////////////////////////////
 //~ rjf: Build Options