diff --git a/crates/valence_inventory/src/menu.rs b/crates/valence_inventory/src/menu.rs
new file mode 100644
index 0000000..41acf16
--- /dev/null
+++ b/crates/valence_inventory/src/menu.rs
@@ -0,0 +1,77 @@
+use std::borrow::Cow;
+
+use bevy_app::{CoreSet, IntoSystemAppConfig, Plugin};
+use bevy_ecs::prelude::*;
+use tracing::debug;
+use valence_client::event_loop::{EventLoopSchedule, PacketEvent};
+use valence_client::Client;
+use valence_core::__private::VarInt;
+use valence_core::item::ItemStack;
+use valence_core::protocol::encode::WritePacket;
+use valence_core::text::Text;
+
+use crate::packet::{
+    ClickSlotC2s, InventoryS2c, OpenScreenS2c, ScreenHandlerSlotUpdateS2c, WindowType,
+};
+use crate::{
+    validate, ClickSlot, ClientInventoryState, CursorItem, DropItemStack, Inventory, InventoryKind,
+    OpenInventory,
+};
+
+#[derive(Debug, Default)]
+pub struct InventoryMenuPlugin;
+
+impl Plugin for InventoryMenuPlugin {
+    fn build(&self, app: &mut bevy_app::App) {
+        app.add_system(
+            handle_click_slot
+                .in_schedule(EventLoopSchedule)
+                .in_base_set(CoreSet::PreUpdate),
+        );
+    }
+}
+
+#[derive(Debug, Component)]
+pub struct OpenMenu;
+
+#[derive(Debug, Component)]
+pub struct InventoryMenu;
+
+fn handle_click_slot(
+    mut clicks: EventReader<ClickSlot>,
+    mut clients: Query<
+        (
+            &mut Client,
+            &mut Inventory,
+            &mut ClientInventoryState,
+            &mut CursorItem,
+            &mut OpenInventory,
+        ),
+        With<OpenMenu>,
+    >,
+    mut inventories: Query<&mut Inventory, (Without<Client>, With<InventoryMenu>)>,
+) {
+    for click in clicks.iter() {
+        println!("menu click: {:?}", click);
+        if let Ok((mut client, mut inv, mut inv_state, mut cursor_item, open_inv)) =
+            clients.get_mut(click.client)
+        {
+            let Ok(mut target) = inventories.get_mut(open_inv.entity) else {
+                continue;
+            };
+            println!("reset clicked slot");
+            target.set_slot(click.slot_id as u16, click.carried_item.clone());
+            inv_state.slots_changed &= !(1 << click.slot_id);
+            client.write_packet(&ScreenHandlerSlotUpdateS2c {
+                window_id: inv_state.window_id as i8,
+                state_id: VarInt(inv_state.state_id.0),
+                slot_idx: click.slot_id,
+                slot_data: Cow::Borrowed(&click.carried_item),
+            });
+
+            println!("clearing cursor item");
+            cursor_item.0 = None;
+            inv_state.client_updated_cursor_item = false;
+        }
+    }
+}