diff --git a/zet b/zet
index f31ffca..5acb41f 100755
--- a/zet
+++ b/zet
@@ -33,7 +33,10 @@ cmd_create() {
 }
 
 cmd_edit() {
-  parse_zet_list < <(search_zettel "$@")
+  QUERY="$*"
+  [[ -d "$QUERY" ]] && edit_zet "$QUERY"
+
+  parse_zet_list < <(search_zettel "$QUERY")
   select_zet
   edit_zet "$SELECTED_ZET"
 }
@@ -61,7 +64,13 @@ cmd_search() {
 }
 
 cmd_view() {
-  parse_zet_list < <(search_zettel "$@")
+  QUERY="$*"
+  if [[ -d "$QUERY" ]]; then
+    view_zettel "$QUERY"
+    exit
+  fi
+
+  parse_zet_list < <(search_zettel "$QUERY")
   select_zet
   view_zettel "$SELECTED_ZET"
 }