diff --git a/crates/nu-command/src/filters/find.rs b/crates/nu-command/src/filters/find.rs
index aa2768ff2f..542aacd545 100644
--- a/crates/nu-command/src/filters/find.rs
+++ b/crates/nu-command/src/filters/find.rs
@@ -8,8 +8,8 @@ use nu_engine::{env_to_string, CallExt};
 use nu_protocol::{
     ast::Call,
     engine::{Command, EngineState, Stack},
-    Category, Config, Example, IntoInterruptiblePipelineData, ListStream, PipelineData, ShellError,
-    Signature, Span, SyntaxShape, Type, Value,
+    Category, Config, Example, IntoInterruptiblePipelineData, IntoPipelineData, ListStream,
+    PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
 };
 use nu_utils::get_ls_colors;
 
@@ -150,6 +150,7 @@ impl Command for Find {
         if let Some(regex) = regex {
             find_with_regex(regex, engine_state, stack, call, input)
         } else {
+            let input = split_string_if_multiline(input);
             find_with_rest_and_highlight(engine_state, stack, call, input)
         }
     }
@@ -591,3 +592,28 @@ mod tests {
         test_examples(Find)
     }
 }
+
+fn split_string_if_multiline(input: PipelineData) -> PipelineData {
+    match input {
+        PipelineData::Value(Value::String { ref val, span }, _) => {
+            if val.contains('\n') {
+                Value::List {
+                    vals: {
+                        val.lines()
+                            .map(|s| Value::String {
+                                val: s.to_string(),
+                                span,
+                            })
+                            .collect()
+                    },
+                    span,
+                }
+                .into_pipeline_data()
+                .set_metadata(input.metadata())
+            } else {
+                input
+            }
+        }
+        _ => input,
+    }
+}
diff --git a/crates/nu-command/tests/commands/find.rs b/crates/nu-command/tests/commands/find.rs
index 07d25ffdae..e73baccc9b 100644
--- a/crates/nu-command/tests/commands/find.rs
+++ b/crates/nu-command/tests/commands/find.rs
@@ -109,3 +109,15 @@ fn find_with_filepath_search_with_multiple_patterns() {
         assert_eq!(actual.out, r#"["amigos.txt","arepas.clu"]"#);
     })
 }
+
+#[test]
+fn find_takes_into_account_linebreaks_in_string() {
+    let actual = nu!(
+    cwd: ".", pipeline(
+    r#"
+        "atest\nanothertest\nnohit\n" | find a | length
+        "#
+    ));
+
+    assert_eq!(actual.out, "2");
+}