2 files changed, 3 insertions, 2 deletions
diff --git a/gfx.cpp b/gfx.cpp
index b95b7d5cf7..2ff1afda30 100644
--- a/gfx.cpp
+++ b/gfx.cpp
@@ -21,6 +21,7 @@
 
 #include "stdafx.h"
 #include "scumm.h"
+#include "gui.h"
 
 void Scumm::getGraphicsPerformance()
 {
@@ -151,7 +152,7 @@ void Scumm::drawDirtyScreenParts()
 	}
 
 	/* Handle shaking */
-	if (_shakeEnabled) {
+	if (_shakeEnabled &&  !_gui->_active) {
 		_shakeFrame = (_shakeFrame + 1) & (NUM_SHAKE_POSITIONS - 1);
 		_system->set_shake_pos(shake_positions[_shakeFrame]);
 	}
diff --git a/gui.cpp b/gui.cpp
index 573dbde687..ab5eae6a46 100644
--- a/gui.cpp
+++ b/gui.cpp
@@ -784,7 +784,7 @@ void Gui::addLetter(byte letter)
 		if (_editString == -1)
 			return;
 
-		if (letter == 13) {
+		if (letter == 13) { 
 			handleCommand(8);
 			return;
 		}