diff --git a/debian/changelog b/debian/changelog
index 2a113ba..3108aff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gnome-shell-extensions (3.18.4-1kali1) kali-dev; urgency=medium
+
+  * Sync with Debian. Remaining changes:
+    - apps-menu with multiple levels
+
+ -- Sophie Brun <sophie@freexian.com>  Fri, 18 Mar 2016 15:47:43 +0100
+
 gnome-shell-extensions (3.18.4-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/apps-menu-with-multiple-levels.patch b/debian/patches/apps-menu-with-multiple-levels.patch
index 5ddb598..d3edc5c 100644
--- a/debian/patches/apps-menu-with-multiple-levels.patch
+++ b/debian/patches/apps-menu-with-multiple-levels.patch
@@ -209,12 +209,12 @@
                      continue;
                  }
                  let app = appSys.lookup_app(id);
--                if (app.get_app_info().should_show())
+-                if (app && app.get_app_info().should_show())
 -                    this.applicationsByCategory[categoryId].push(app);
 +                if (app.get_app_info().should_show()) {
 +                    let menu_id = dir.get_menu_id();
 +                    this.applicationsByCategory[menu_id].push(app);
-+		}
++                }
              } else if (nextType == GMenu.TreeItemType.DIRECTORY) {
                  let subdir = iter.get_directory();
 -                if (!subdir.get_is_nodisplay())
@@ -228,8 +228,8 @@
 +                        categoryMenuItem = new CategoryMenuItem(this, subdir);
 +                    if (this.applicationsByCategory[menu_id].length > 0 || !categoryMenuItem.menu.isEmpty()) {
 +                        parentCategory.menu.addMenuItem(categoryMenuItem);
-+                    }
-+		}
++                   }
++                }
              }
          }
      },