diff --git a/src/yaml/cameraParser.cc b/src/yaml/cameraParser.cc
index 298a1f0..6e2b925 100644
--- a/src/yaml/cameraParser.cc
+++ b/src/yaml/cameraParser.cc
@@ -159,6 +159,9 @@ CameraParser::HandleTypeEvent(yaml_event_t& event)
     else {
         assert(false);
     }
+
+    mSection = NoSection;
+    SetShouldExpectKey(true);
 }
 
 
diff --git a/src/yaml/sceneParser.cc b/src/yaml/sceneParser.cc
index 611aa92..e94199b 100644
--- a/src/yaml/sceneParser.cc
+++ b/src/yaml/sceneParser.cc
@@ -76,6 +76,13 @@ SceneParser::HandleCameraEvent(yaml_event_t& event)
     }
 
     GetParsers().push(new CameraParser(GetScene(), GetParsers()));
+
+    /*
+     * When the camera parser is done, we should be back to expecting a key for
+     * the Scene.
+     */
+    mSection = NoSection;
+    SetShouldExpectKey(true);
 }