diff --git a/debian/changelog b/debian/changelog
index 587f4351ff..5d809b2f5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+sway-regolith (1.7-6) focal; urgency=medium
+
+  [ Soumya Ranjan Patnaik ]
+  * Fixed tray context menu, v1.7-5 didn't bring in the required changes
+
+ -- Soumya Ranjan Patnaik <soumyaranjan1812@gmail.com>  Mon, 09 Jan 2023 10:57:42 +0530
+
+sway-regolith (1.7-5) focal; urgency=medium
+
+  [ Soumya Ranjan Patnaik ]
+  * Support for tray context menu
+
+ -- soumyarp <soumyaranjan1812@gmail.com>  Mon, 09 Jan 2023 04:24:58 +0530
+
 sway-regolith (1.7-5) focal; urgency=medium
 
   * Updated control to provide sway
diff --git a/swaybar/tray/dbusmenu.c b/swaybar/tray/dbusmenu.c
index b1a518dca6..557f2bb004 100644
--- a/swaybar/tray/dbusmenu.c
+++ b/swaybar/tray/dbusmenu.c
@@ -545,7 +545,7 @@ static void swaybar_dbusmenu_draw_menu(struct swaybar_dbusmenu_menu *menu,
 		menu->dbusmenu->drawing = false;
 		return;
 	}
-	int surface_x, surface_y, surface_width, surface_height;
+	int surface_x = 0, surface_y = 0, surface_width = 0, surface_height = 0;
 	draw_menu_items(cairo, menu, &surface_x, &surface_y, &surface_width,
 					&surface_height, open);