diff --git a/src/raddbg/raddbg_core.c b/src/raddbg/raddbg_core.c
index d939bbfe..16417ca5 100644
--- a/src/raddbg/raddbg_core.c
+++ b/src/raddbg/raddbg_core.c
@@ -1844,7 +1844,7 @@ rd_title_fstrs_from_entity(Arena *arena, RD_Entity *entity, Vec4F32 secondary_co
       dr_fancy_string_list_concat_in_place(&result, &cnd_fstrs);
     }
   }
-  if(entity->kind == RD_EntityKind_Target && entity->disabled)
+  if((entity->kind == RD_EntityKind_Target || entity->kind == RD_EntityKind_Breakpoint) && entity->disabled)
   {
     dr_fancy_string_list_push_new(arena, &result, rd_font_from_slot(RD_FontSlot_Code), size, v4f32(0, 0, 0, 0), str8_lit(" "));
     dr_fancy_string_list_push_new(arena, &result, rd_font_from_slot(RD_FontSlot_Main), size*0.95f, secondary_color, str8_lit("(Disabled)"));
diff --git a/src/raddbg/raddbg_widgets.c b/src/raddbg/raddbg_widgets.c
index c9725318..824599a2 100644
--- a/src/raddbg/raddbg_widgets.c
+++ b/src/raddbg/raddbg_widgets.c
@@ -1401,8 +1401,14 @@ rd_code_slice(RD_CodeSliceParams *params, TxtPt *cursor, TxtPt *mark, S64 *prefe
               RD_RegsScope(.entity = rd_handle_from_entity(bp)) rd_set_hover_regs(RD_RegSlot_Entity);
             }
             
+            // rjf: shift+click => enable breakpoint
+            if(ui_clicked(bp_sig) && bp_sig.event_flags & OS_Modifier_Shift)
+            {
+              rd_cmd(bp->disabled ? RD_CmdKind_EnableEntity : RD_CmdKind_DisableEntity, .entity = rd_handle_from_entity(bp));
+            }
+            
             // rjf: click => remove breakpoint
-            if(ui_clicked(bp_sig))
+            if(ui_clicked(bp_sig) && bp_sig.event_flags == 0)
             {
               rd_cmd(RD_CmdKind_RemoveEntity, .entity = rd_handle_from_entity(bp));
             }