diff --git a/Media/Themes/Umami/Theme.HC b/Media/Themes/Umami/Theme.HC
index 3a9ddcd..99d6a68 100644
--- a/Media/Themes/Umami/Theme.HC
+++ b/Media/Themes/Umami/Theme.HC
@@ -1312,9 +1312,14 @@ U0 @umami_set_focused_and_hovered_widget(Window* win, I64 event)
                 if (@gui_window_is_hovered(win) && @widget_is_hovered(x, y, widget)) {
                     widget_is_hovered = TRUE;
                     win->hovered_widget = widget;
-                    if (widget_is_hovered && event == CPZ_MSG_WIN_LEFT_BTN_DOWN) {
+                    switch (event) {
+                    case CPZ_MSG_WIN_LEFT_BTN_DOWN:
+                    case CPZ_MSG_WIN_RIGHT_BTN_DOWN:
                         win->focused_widget = widget;
                         win->mouse_down_widget = widget;
+                        break;
+                    default:
+                        break;
                     }
                 }
             }
@@ -1325,7 +1330,7 @@ U0 @umami_set_focused_and_hovered_widget(Window* win, I64 event)
     if (!widget_is_hovered)
         win->hovered_widget = NULL;
 
-    if (!Mouse.left && win->mouse_down_widget) {
+    if (!Mouse.left && !Mouse.right && win->mouse_down_widget) {
         widget = win->mouse_down_widget;
         x = win->x + origin_x + widget->x;
         y = win->y + origin_y + widget->y;