diff --git a/engines/twine/debug_grid.cpp b/engines/twine/debug_grid.cpp
index 17bcb900d2b..896e635b382 100644
--- a/engines/twine/debug_grid.cpp
+++ b/engines/twine/debug_grid.cpp
@@ -39,8 +39,6 @@ void DebugGrid::changeGridCamera() {
 		return;
 	}
 
-	ScopedKeyMap scopedKeyMap(_engine, mainKeyMapId);
-
 	if (_engine->_input->isActionActive(TwinEActionType::DebugGridCameraPressUp)) {
 		_engine->_grid->newCameraZ--;
 		_engine->_redraw->reqBgRedraw = true;
diff --git a/engines/twine/redraw.cpp b/engines/twine/redraw.cpp
index bd206170627..04e3de9364f 100644
--- a/engines/twine/redraw.cpp
+++ b/engines/twine/redraw.cpp
@@ -437,6 +437,7 @@ void Redraw::redrawEngineActions(int32 bgRedraw) { // fullRedraw
 			// Drawing unknown
 			else if (flags < 0x1000) {
 				// TODO reverse this part of the code
+				warning("Not yet reversed part of the rendering code");
 			}
 			// Drawing sprite actors
 			else if (flags == 0x1000) {
diff --git a/engines/twine/scene.cpp b/engines/twine/scene.cpp
index b2ab03b25b4..3557f1c23da 100644
--- a/engines/twine/scene.cpp
+++ b/engines/twine/scene.cpp
@@ -26,6 +26,7 @@
 #include "common/util.h"
 #include "twine/actor.h"
 #include "twine/animations.h"
+#include "twine/debug_grid.h"
 #include "twine/extra.h"
 #include "twine/gamestate.h"
 #include "twine/grid.h"
@@ -449,7 +450,7 @@ void Scene::processActorZones(int32 actorIdx) {
 				}
 				break;
 			case kCamera:
-				if (currentlyFollowedActor == actorIdx) {
+				if (currentlyFollowedActor == actorIdx && !_engine->_debugGrid->useFreeCamera) {
 					_engine->disableScreenRecenter = true;
 					if (_engine->_grid->newCameraX != zone->infoData.CameraView.x || _engine->_grid->newCameraY != zone->infoData.CameraView.y || _engine->_grid->newCameraZ != zone->infoData.CameraView.z) {
 						_engine->_grid->newCameraX = zone->infoData.CameraView.x;