diff --git a/crates/gpui2/src/action.rs b/crates/gpui2/src/action.rs
index 6526f96cb9cbc0f5be445906cc55eb2801dc429d..06e93e275d260a9d83e0d860f8f853ad00144582 100644
--- a/crates/gpui2/src/action.rs
+++ b/crates/gpui2/src/action.rs
@@ -176,8 +176,7 @@ macro_rules! actions {
     () => {};
 
     ( $name:ident ) => {
-        #[gpui::register_action]
-        #[derive(::std::clone::Clone, ::std::default::Default, ::std::fmt::Debug, ::std::cmp::PartialEq, $crate::serde::Deserialize)]
+        #[gpui::action]
         pub struct $name;
     };
 
diff --git a/crates/gpui2_macros/src/action.rs b/crates/gpui2_macros/src/action.rs
index 66302f3fc0b6ee519e349376ca65fda8b2e4a783..564f35d6a4da2d873afb5e4a059c295b11d1ef58 100644
--- a/crates/gpui2_macros/src/action.rs
+++ b/crates/gpui2_macros/src/action.rs
@@ -34,13 +34,21 @@ pub fn action(_attr: TokenStream, item: TokenStream) -> TokenStream {
     let visibility = input.vis;
 
     let output = match input.data {
-        syn::Data::Struct(ref struct_data) => {
-            let fields = &struct_data.fields;
-            quote! {
-                #attributes
-                #visibility struct #name #fields
+        syn::Data::Struct(ref struct_data) => match &struct_data.fields {
+            syn::Fields::Named(_) | syn::Fields::Unnamed(_) => {
+                let fields = &struct_data.fields;
+                quote! {
+                    #attributes
+                    #visibility struct #name #fields
+                }
             }
-        }
+            syn::Fields::Unit => {
+                quote! {
+                    #attributes
+                    #visibility struct #name;
+                }
+            }
+        },
         syn::Data::Enum(ref enum_data) => {
             let variants = &enum_data.variants;
             quote! {
diff --git a/crates/menu2/src/menu2.rs b/crates/menu2/src/menu2.rs
index 44ebffcca2de58e43f5452d6975cb54462ed33bb..6dfcce5d4f751c3e990d1a3c440ddebdf237d162 100644
--- a/crates/menu2/src/menu2.rs
+++ b/crates/menu2/src/menu2.rs
@@ -1,9 +1,13 @@
 use gpui::actions;
 
-// todo!(remove this)
+// If the zed binary doesn't use anything in this crate, it will be optimized away
+// and the actions won't initialize. So we just provide an empty initialization function
+// to be called from main.
+//
+// These may provide relevant context:
 // https://github.com/rust-lang/rust/issues/47384
 // https://github.com/mmastrac/rust-ctor/issues/280
-pub fn unused() {}
+pub fn init() {}
 
 actions!(
     Cancel,
diff --git a/crates/zed2/src/main.rs b/crates/zed2/src/main.rs
index 4ae77ccf0c4d4318969a2258d748a712d52c35d7..2deaff21491a73bd54bcf5d80a0d2ca9c7a76a7f 100644
--- a/crates/zed2/src/main.rs
+++ b/crates/zed2/src/main.rs
@@ -57,10 +57,7 @@ use zed2::{
 mod open_listener;
 
 fn main() {
-    //TODO!(figure out what the linker issues are here)
-    // https://github.com/rust-lang/rust/issues/47384
-    // https://github.com/mmastrac/rust-ctor/issues/280
-    menu::unused();
+    menu::init();
     let http = http::client();
     init_paths();
     init_logger();