2 files changed, 8 insertions, 2 deletions

diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 96feb47d..409e7b12 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -85,6 +85,10 @@ static struct sway_node *node_at_coords(
                 return NULL;
         }
         struct sway_output *output = wlr_output->data;
+        if (!output) {
+                // output is being destroyed
+                return NULL;
+        }
         double ox = lx, oy = ly;
         wlr_output_layout_output_coords(root->output_layout, wlr_output, &ox, &oy);
 
@@ -1092,6 +1096,8 @@ static void dispatch_cursor_axis(struct sway_cursor *cursor,
         enum wlr_edges edge = cont ? find_edge(cont, cursor) : WLR_EDGE_NONE;
         bool on_border = edge != WLR_EDGE_NONE;
         bool on_titlebar = cont && !on_border && !surface;
+        bool on_titlebar_border = cont && on_border &&
+                cursor->cursor->y < cont->content_y;
         bool on_contents = cont && !on_border && surface;
         float scroll_factor =
                 (ic == NULL || ic->scroll_factor == FLT_MIN) ? 1.0f : ic->scroll_factor;
@@ -1117,7 +1123,7 @@ static void dispatch_cursor_axis(struct sway_cursor *cursor,
         }
 
         // Scrolling on a tabbed or stacked title bar (handled as press event)
-        if (!handled && on_titlebar) {
+        if (!handled && (on_titlebar || on_titlebar_border)) {
                 enum sway_container_layout layout = container_parent_layout(cont);
                 if (layout == L_TABBED || layout == L_STACKED) {
                         struct sway_node *tabcontainer = node_get_parent(node);
diff --git a/sway/tree/output.c b/sway/tree/output.c
index 95ab9378..f24be010 100644
--- a/sway/tree/output.c
+++ b/sway/tree/output.c
@@ -58,6 +58,7 @@ struct sway_output *output_create(struct wlr_output *wlr_output) {
         wlr_output->data = output;
 
         wl_signal_add(&wlr_output->events.destroy, &output->destroy);
+        wl_signal_init(&output->events.destroy);
 
         wl_list_insert(&root->all_outputs, &output->link);
 
@@ -76,7 +77,6 @@ void output_enable(struct sway_output *output, struct output_config *oc) {
         for (size_t i = 0; i < len; ++i) {
                 wl_list_init(&output->layers[i]);
         }
-        wl_signal_init(&output->events.destroy);
 
         output->enabled = true;
         list_add(root->outputs, output);