diff --git a/src/drivers/Qt/TasEditor/playback.cpp b/src/drivers/Qt/TasEditor/playback.cpp
index 9e2426d9..060a5f03 100644
--- a/src/drivers/Qt/TasEditor/playback.cpp
+++ b/src/drivers/Qt/TasEditor/playback.cpp
@@ -158,6 +158,11 @@ void PLAYBACK::update()
 	// pause when seeking hits pause_frame
 	if (pauseFrame && currFrameCounter + 1 >= pauseFrame)
 	{
+		// force frame counter back to target pause frame,
+		// since Qt/SDL port is multithreaded, emulation thread sometimes overshoots target
+		// before GUI thread can shutoff seek.
+		//currFrameCounter = pauseFrame - 1;
+
 		stopSeeking();
 	}
 	else if (currFrameCounter >= getLastPosition() && currFrameCounter >= currMovieData.getNumRecords() - 1 && mustAutopauseAtTheEnd && taseditorConfig->autopauseAtTheEndOfMovie && !isTaseditorRecording())
@@ -363,6 +368,7 @@ void PLAYBACK::startSeekingToFrame(int frame)
 void PLAYBACK::stopSeeking()
 {
 	pauseFrame = 0;
+	//printf("Seek Finished\n");
 	//if ( turbo )
 	//{
 	//	printf("Turbo seek off\n");
@@ -567,6 +573,7 @@ int PLAYBACK::getLastPosition()
 	return lastPositionFrame - 1;
 }
 
+// getPauseFrame must be thread safe, it is called from both GUI and emulation threads.
 int PLAYBACK::getPauseFrame()
 {
 	return pauseFrame - 1;
diff --git a/src/drivers/Qt/fceuWrapper.cpp b/src/drivers/Qt/fceuWrapper.cpp
index a30046bb..5ad2cfa9 100644
--- a/src/drivers/Qt/fceuWrapper.cpp
+++ b/src/drivers/Qt/fceuWrapper.cpp
@@ -1194,6 +1194,23 @@ static void DoFun(int frameskip, int periodic_saves)
 	static int fskipc = 0;
 	//static int opause = 0;
 
+	// If TAS editor is engaged, check whether a seek frame is set.
+	// If a seek is in progress, don't emulate past target frame.
+	if ( tasWindowIsOpen() )
+	{
+		int runToFrameTarget;
+	
+		runToFrameTarget = tasWin->playback.getPauseFrame();
+
+		if ( runToFrameTarget >= 0)
+		{
+			if ( currFrameCounter >= runToFrameTarget )
+			{
+				FCEUI_SetEmulationPaused(EMULATIONPAUSED_PAUSED);
+				return;
+			}
+		}
+	}
     //TODO peroidic saves, working on it right now
     if (periodic_saves && FCEUD_GetTime() % PERIODIC_SAVE_INTERVAL < 30){
         FCEUI_SaveState(NULL, false);