diff --git a/src/drivers/win/taseditor.cpp b/src/drivers/win/taseditor.cpp
index d29779ed..05d25851 100644
--- a/src/drivers/win/taseditor.cpp
+++ b/src/drivers/win/taseditor.cpp
@@ -200,6 +200,7 @@ void UpdateTasEditor()
 	} else
 	{
 		// update all modules that need to be updated every frame
+		// the order is somewhat important, e.g. Greenzone must update before Bookmark Set, Piano Roll must update before Selection
 		taseditor_window.update();
 		greenzone.update();
 		recorder.update();
diff --git a/src/video.cpp b/src/video.cpp
index da0dc141..c0512948 100644
--- a/src/video.cpp
+++ b/src/video.cpp
@@ -127,7 +127,6 @@ int FCEU_InitVirtualVideo(void)
 		return 1;
 }
 
-void ShowFPS(void);
 #ifdef FRAMESKIP
 void FCEU_PutImageDummy(void)
 {
@@ -153,7 +152,6 @@ void FCEUI_SaveSnapshotAs(void)
 	dosnapsave=2;
 }
 
-
 static void ReallySnap(void)
 {
 	int x=SaveSnapshot();
@@ -165,7 +163,6 @@ static void ReallySnap(void)
 
 void FCEU_PutImage(void)
 {
-	ShowFPS();
 	if(dosnapsave==2)	//Save screenshot as, currently only flagged & run by the Win32 build. //TODO SDL: implement this?
 	{
 		char nameo[512];
@@ -219,6 +216,7 @@ void FCEU_PutImage(void)
 		FCEU_DrawLagCounter(XBuf);
 		FCEU_DrawNTSCControlBars(XBuf);
 		FCEU_DrawRecordingStatus(XBuf);
+		ShowFPS();
 	}
 
 	if(FCEUD_ShouldDrawInputAids())
diff --git a/src/video.h b/src/video.h
index 56dfeb4d..daee0e6b 100644
--- a/src/video.h
+++ b/src/video.h
@@ -33,5 +33,6 @@ std::string FCEUI_GetSnapshotAsName();
 void FCEUI_SetSnapshotAsName(std::string name);
 bool FCEUI_ShowFPS();
 void FCEUI_SetShowFPS(bool showFPS);
+void ShowFPS();
 void snapAVI();
 #endif