diff --git a/crates/assistant_tools/src/edit_agent/create_file_parser.rs b/crates/assistant_tools/src/edit_agent/create_file_parser.rs
index 5126f9c6b1fe4ee5cc600ae93b7300b7af09451f..2272434d796a92e53b741f8ed5f4303d94f88489 100644
--- a/crates/assistant_tools/src/edit_agent/create_file_parser.rs
+++ b/crates/assistant_tools/src/edit_agent/create_file_parser.rs
@@ -160,7 +160,7 @@ mod tests {
                 &mut parser,
                 &mut rng
             ),
-            // This output is marlformed, so we're doing our best effort
+            // This output is malformed, so we're doing our best effort
             "Hello world\n```\n\nThe end\n".to_string()
         );
     }
@@ -182,7 +182,7 @@ mod tests {
                 &mut parser,
                 &mut rng
             ),
-            // This output is marlformed, so we're doing our best effort
+            // This output is malformed, so we're doing our best effort
             "```\nHello world\n```\n".to_string()
         );
     }
diff --git a/crates/assistant_tools/src/edit_agent/evals/fixtures/use_wasi_sdk_in_compile_parser_to_wasm/before.rs b/crates/assistant_tools/src/edit_agent/evals/fixtures/use_wasi_sdk_in_compile_parser_to_wasm/before.rs
index b51c74c798d88b3f84303ffe41f4ac2590e7f236..cfa28fe1ad6091c9adda22f610e1cf13166f8dfb 100644
--- a/crates/assistant_tools/src/edit_agent/evals/fixtures/use_wasi_sdk_in_compile_parser_to_wasm/before.rs
+++ b/crates/assistant_tools/src/edit_agent/evals/fixtures/use_wasi_sdk_in_compile_parser_to_wasm/before.rs
@@ -916,7 +916,7 @@ impl Loader {
                                 if !found_non_static {
                                     found_non_static = true;
                                     eprintln!(
-                                        "Warning: Found non-static non-tree-sitter functions in the external scannner"
+                                        "Warning: Found non-static non-tree-sitter functions in the external scanner"
                                     );
                                 }
                                 eprintln!("  `{function_name}`");
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 603dcdece22053d131441929fe4270371e803463..230c3160fb616984f71ce12b7b3b6b8d459d6356 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -9694,7 +9694,7 @@ impl EditorScrollbars {
                 editor_bounds.bottom_left(),
                 size(
                     // The horizontal viewport size differs from the space available for the
-                    // horizontal scrollbar, so we have to manually stich it together here.
+                    // horizontal scrollbar, so we have to manually stitch it together here.
                     editor_bounds.size.width - right_margin,
                     scrollbar_width,
                 ),
diff --git a/crates/inspector_ui/README.md b/crates/inspector_ui/README.md
index 5c720dfea2df3ff2ddf75112fec8793ba1851ed1..74886e611108fd4fd3f5f5015746f913e2697cae 100644
--- a/crates/inspector_ui/README.md
+++ b/crates/inspector_ui/README.md
@@ -68,7 +68,7 @@ With both approaches, would need to record the buffer version and use that when
 
 * Mode to navigate to source code on every element change while picking.
 
-* Tracking of more source locations - currently the source location is often in a ui compoenent. Ideally this would have a way for the components to indicate that they are probably not the source location the user is looking for.
+* Tracking of more source locations - currently the source location is often in a ui component. Ideally this would have a way for the components to indicate that they are probably not the source location the user is looking for.
 
   - Could have `InspectorElementId` be `Vec<(ElementId, Option<Location>)>`, but if there are multiple code paths that construct the same element this would cause them to be considered different.