diff --git a/src/raddbg/raddbg_core.c b/src/raddbg/raddbg_core.c
index 6b8f6155..e94f2fca 100644
--- a/src/raddbg/raddbg_core.c
+++ b/src/raddbg/raddbg_core.c
@@ -12088,6 +12088,15 @@ rd_frame(void)
               }
             }
             
+            // rjf: run -> no targets at all, no processes? -> do helper for add-target
+            if((kind == RD_CmdKind_Run ||
+                kind == RD_CmdKind_StepInto ||
+                kind == RD_CmdKind_StepOver) && targets.count == 0 && processes.count == 0)
+            {
+              rd_cmd(RD_CmdKind_RunCommand, .cmd_name = rd_cmd_kind_info_table[RD_CmdKind_AddTarget].string);
+              break;
+            }
+            
             // rjf: run -> no active targets, no processes? -> do helper for launch-and-run
             if((kind == RD_CmdKind_Run ||
                 kind == RD_CmdKind_StepInto ||
diff --git a/src/ui/ui_core.c b/src/ui/ui_core.c
index 2ed424ff..dfc614e7 100644
--- a/src/ui/ui_core.c
+++ b/src/ui/ui_core.c
@@ -1255,8 +1255,11 @@ ui_end_build(void)
     UI_Box *anchor_box = ui_box_from_key(ui_state->tooltip_anchor_key);
     if(!ui_box_is_nil(anchor_box))
     {
-      ui_state->tooltip_root->rect.x0 = anchor_box->rect.x0;
-      ui_state->tooltip_root->rect.y0 = anchor_box->rect.y1 + anchor_box->font_size*0.5f;
+      Vec2F32 dim = dim_2f32(ui_state->tooltip_root->rect);
+      ui_state->tooltip_root->fixed_position.x = ui_state->tooltip_root->rect.x0 = anchor_box->rect.x0;
+      ui_state->tooltip_root->fixed_position.y = ui_state->tooltip_root->rect.y0 = anchor_box->rect.y1 + anchor_box->font_size*0.5f;
+      ui_state->tooltip_root->rect.x1 = ui_state->tooltip_root->rect.x0 + dim.x;
+      ui_state->tooltip_root->rect.y1 = ui_state->tooltip_root->rect.y0 + dim.y;
     }
     else
     {