diff --git a/src/app/editor/master_editor.cc b/src/app/editor/master_editor.cc
index f0b6bfae..4ee75c3d 100644
--- a/src/app/editor/master_editor.cc
+++ b/src/app/editor/master_editor.cc
@@ -321,7 +321,10 @@ void MasterEditor::ManageKeyboardShortcuts() {
     status_ = current_editor_->Redo();
   }
 
-  // TODO: If CMD + F is pressed, open a search dialog
+  if (ImGui::IsKeyDown(ImGuiKey_F) &&
+      (ImGui::GetIO().KeyCtrl || ImGui::GetIO().KeySuper)) {
+    status_ = current_editor_->Find();
+  }
 }
 
 void MasterEditor::DrawFileDialog() {