diff --git a/crates/story/src/input_story.rs b/crates/story/src/input_story.rs
index 8ee53352..3b13f1ec 100644
--- a/crates/story/src/input_story.rs
+++ b/crates/story/src/input_story.rs
@@ -10,8 +10,7 @@ use ui::{
     button::{Button, ButtonVariant, ButtonVariants as _},
     checkbox::Checkbox,
     h_flex,
-    input::{InputEvent, OtpInput, TextInput},
-    number_input::{NumberInput, NumberInputEvent},
+    input::{InputEvent, NumberInput, NumberInputEvent, OtpInput, TextInput},
     prelude::FluentBuilder as _,
     v_flex, FocusableCycle, IconName, Sizable,
 };
@@ -260,13 +259,13 @@ impl InputStory {
                 InputEvent::Blur => println!("Blur"),
             },
             NumberInputEvent::Step(step_action) => match step_action {
-                ui::number_input::StepAction::Decrement => {
+                ui::input::StepAction::Decrement => {
                     self.number_input1_value = self.number_input1_value - 1;
                     self.number_input1.update(cx, |input, cx| {
                         input.set_value(self.number_input1_value.to_string(), cx);
                     });
                 }
-                ui::number_input::StepAction::Increment => {
+                ui::input::StepAction::Increment => {
                     self.number_input1_value = self.number_input1_value + 1;
                     self.number_input1.update(cx, |input, cx| {
                         input.set_value(self.number_input1_value.to_string(), cx);
@@ -290,7 +289,7 @@ impl InputStory {
                 InputEvent::Blur => println!("Blur"),
             },
             NumberInputEvent::Step(step_action) => match step_action {
-                ui::number_input::StepAction::Decrement => {
+                ui::input::StepAction::Decrement => {
                     if self.number_input2_value.le(&0) {
                         return;
                     }
@@ -300,7 +299,7 @@ impl InputStory {
                         input.set_value(self.number_input2_value.to_string(), cx);
                     });
                 }
-                ui::number_input::StepAction::Increment => {
+                ui::input::StepAction::Increment => {
                     self.number_input2_value = self.number_input2_value + 1;
                     self.number_input2.update(cx, |input, cx| {
                         input.set_value(self.number_input2_value.to_string(), cx);
diff --git a/crates/ui/src/input/input.rs b/crates/ui/src/input/input.rs
index 75f7a924..8ccc62b3 100644
--- a/crates/ui/src/input/input.rs
+++ b/crates/ui/src/input/input.rs
@@ -26,7 +26,7 @@ use gpui::{
 use super::blink_cursor::BlinkCursor;
 use super::change::Change;
 use super::element::TextElement;
-use super::ClearButton;
+use super::{number_input, ClearButton};
 
 use crate::history::History;
 use crate::indicator::Indicator;
@@ -155,6 +155,8 @@ pub fn init(cx: &mut AppContext) {
         #[cfg(not(target_os = "macos"))]
         KeyBinding::new("ctrl-y", Redo, Some(CONTEXT)),
     ]);
+
+    number_input::init(cx);
 }
 
 pub struct TextInput {
diff --git a/crates/ui/src/input/mod.rs b/crates/ui/src/input/mod.rs
index 2495af91..fbcd7a63 100644
--- a/crates/ui/src/input/mod.rs
+++ b/crates/ui/src/input/mod.rs
@@ -3,8 +3,10 @@ mod change;
 mod clear_button;
 mod element;
 mod input;
+mod number_input;
 mod otp_input;
 
 pub(crate) use clear_button::*;
 pub use input::*;
+pub use number_input::{NumberInput, NumberInputEvent, StepAction};
 pub use otp_input::*;
diff --git a/crates/ui/src/number_input.rs b/crates/ui/src/input/number_input.rs
similarity index 100%
rename from crates/ui/src/number_input.rs
rename to crates/ui/src/input/number_input.rs
diff --git a/crates/ui/src/lib.rs b/crates/ui/src/lib.rs
index 9ae18126..168f989c 100644
--- a/crates/ui/src/lib.rs
+++ b/crates/ui/src/lib.rs
@@ -31,7 +31,6 @@ pub mod link;
 pub mod list;
 pub mod modal;
 pub mod notification;
-pub mod number_input;
 pub mod popover;
 pub mod popup_menu;
 pub mod prelude;
@@ -91,7 +90,6 @@ pub fn init(cx: &mut gpui::AppContext) {
     drawer::init(cx);
     dropdown::init(cx);
     input::init(cx);
-    number_input::init(cx);
     list::init(cx);
     modal::init(cx);
     popover::init(cx);