diff --git a/src/path_parser.hpp b/src/path_parser.hpp
index 3abbce3..20c48da 100644
--- a/src/path_parser.hpp
+++ b/src/path_parser.hpp
@@ -464,7 +464,9 @@
     (module >> "*");
 
 auto const cdPath_def =
-    PathParser<PathParserMode::DataPath, CompletionMode::Data>{noRpcOrAction};
+    PathParser<PathParserMode::DataPath, CompletionMode::Data>{[] (const Schema& schema, const std::string& path) {
+        return noRpcOrAction(schema, path) && schema.nodeType(path) != yang::NodeTypes::Leaf;
+    }};
 
 auto const presenceContainerPath_def =
     dataPath;