diff --git a/awesome.c b/awesome.c
index b847603c..c0004518 100644
--- a/awesome.c
+++ b/awesome.c
@@ -539,7 +539,7 @@ main(int argc, char **argv)
     /* scan existing windows */
     scan(tree_c);
 
-    xcb_flush(globalconf.connection);
+    luaA_emit_startup();
 
     /* Setup the main context */
     g_main_context_set_poll_func(g_main_context_default(), &a_glib_poll);
diff --git a/luaa.c b/luaa.c
index 1a2aef78..bfd1b6b3 100644
--- a/luaa.c
+++ b/luaa.c
@@ -474,6 +474,7 @@ luaA_init(xdgHandle* xdg)
     signal_add(&global_signals, "systray::update");
     signal_add(&global_signals, "wallpaper_changed");
     signal_add(&global_signals, "refresh");
+    signal_add(&global_signals, "startup");
     signal_add(&global_signals, "exit");
 }
 
@@ -587,6 +588,13 @@ luaA_class_newindex_miss_property(lua_State *L, lua_object_t *obj)
     return 0;
 }
 
+void
+luaA_emit_startup()
+{
+    lua_State *L = globalconf_get_lua_State();
+    signal_object_emit(L, &global_signals, "startup", 0);
+}
+
 void
 luaA_emit_refresh()
 {
diff --git a/luaa.h b/luaa.h
index 9576908b..b84f1558 100644
--- a/luaa.h
+++ b/luaa.h
@@ -206,6 +206,7 @@ int luaA_class_index_miss_property(lua_State *, lua_object_t *);
 int luaA_class_newindex_miss_property(lua_State *, lua_object_t *);
 int luaA_default_index(lua_State *);
 int luaA_default_newindex(lua_State *);
+void luaA_emit_startup(void);
 
 void luaA_systray_invalidate(void);