diff --git a/src/modules/eterm/src/eterm/ui/uiterminal.cpp b/src/modules/eterm/src/eterm/ui/uiterminal.cpp
index cb3840f7b..310efeaf0 100644
--- a/src/modules/eterm/src/eterm/ui/uiterminal.cpp
+++ b/src/modules/eterm/src/eterm/ui/uiterminal.cpp
@@ -305,7 +305,7 @@ void UITerminal::scheduledUpdate( const Time& ) {
 		return;
 	mTerm->update();
 
-	if ( mTerm->isDirty() )
+	if ( mTerm->isDirty() && isVisible() )
 		invalidateDraw();
 
 	if ( ScrollBarMode::AlwaysOn == mVScrollMode ) {
diff --git a/src/tools/ecode/ecode.cpp b/src/tools/ecode/ecode.cpp
index 21b308ced..acaae70b3 100644
--- a/src/tools/ecode/ecode.cpp
+++ b/src/tools/ecode/ecode.cpp
@@ -3006,6 +3006,8 @@ void App::init( const LogLevel& logLevel, std::string file, const Float& pidelDe
 
 		Log::info( "Window creation took: %.2f ms", globalClock.getElapsedTime().asMilliseconds() );
 
+		mWindow->setFrameRateLimit( mConfig.context.FrameRateLimit );
+
 		if ( mConfig.windowState.position != Vector2i( -1, -1 ) &&
 			 mConfig.windowState.displayIndex < displayManager->getDisplayCount() ) {
 			mWindow->setPosition( mConfig.windowState.position.x, mConfig.windowState.position.y );