diff --git a/changelog.txt b/changelog.txt
index 20ee50c0..fa856c79 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,4 +1,5 @@
 ---version 2.0.4 yet to be released---
+12-mar-2009 - adelikat - Win32 - Trace Logger - fixed bug where user can't scroll the log window while it is auto-updating
 11-mar-2009 - adelikat - Win32 - Trace Logger - changed message about F2 pause (left over from FCEUXDSP) to display the current hotkey mapping
 11-mar-2009 - adelikat - Added frame counter to savestates
 08-mar-2009 - adelikat - Lua - added input.get() function
diff --git a/src/drivers/win/debugger.cpp b/src/drivers/win/debugger.cpp
index a466547c..862d693e 100644
--- a/src/drivers/win/debugger.cpp
+++ b/src/drivers/win/debugger.cpp
@@ -1243,6 +1243,7 @@ BOOL CALLBACK DebuggerCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
 								FCEUI_Debugger().step = true;
 								FCEUI_SetEmulationPaused(0);
 								UpdateDebugger();
+								UpdateLogWindow();
 								break;
 							case IDC_DEBUGGER_RUN_LINE:
 								if (FCEUI_EmulationPaused()) {
@@ -1257,6 +1258,7 @@ BOOL CALLBACK DebuggerCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
 								}
 								FCEUI_SetEmulationPaused(0);
 								UpdateDebugger();
+								UpdateLogWindow();
 								break;
 							case IDC_DEBUGGER_RUN_FRAME2:
 								if (FCEUI_EmulationPaused()) {
@@ -1271,6 +1273,7 @@ BOOL CALLBACK DebuggerCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
 								}
 								FCEUI_SetEmulationPaused(0);
 								UpdateDebugger();
+								UpdateLogWindow();
 								break;
 							case IDC_DEBUGGER_STEP_OUT:
 								//mbg merge 7/18/06 changed pausing check and set
@@ -1285,7 +1288,7 @@ BOOL CALLBACK DebuggerCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
 									//UpdateDebugger();
 								}
 								break;
-                                                        case IDC_DEBUGGER_STEP_OVER:
+							case IDC_DEBUGGER_STEP_OVER:
 								//mbg merge 7/18/06 changed pausing check and set
 								if (FCEUI_EmulationPaused()) {
 									UpdateRegs(hwndDlg);
@@ -1296,6 +1299,7 @@ BOOL CALLBACK DebuggerCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
 									}
 									else FCEUI_Debugger().step = true;
 									FCEUI_SetEmulationPaused(0);
+								UpdateLogWindow();
 								}
 								break;
 							case IDC_DEBUGGER_SEEK_PC:
diff --git a/src/drivers/win/main.cpp b/src/drivers/win/main.cpp
index cbac9abb..362c6e36 100644
--- a/src/drivers/win/main.cpp
+++ b/src/drivers/win/main.cpp
@@ -761,7 +761,7 @@ void _updateWindow()
 	PPUViewDoBlit();
 	UpdateMemoryView(0);
 	UpdateCDLogger();
-	UpdateLogWindow();
+	//UpdateLogWindow();
 	UpdateMemWatch();
 	NTViewDoBlit(0);
 	UpdateTasEdit();
diff --git a/src/fceu.cpp b/src/fceu.cpp
index 62ca8e0a..6982af69 100644
--- a/src/fceu.cpp
+++ b/src/fceu.cpp
@@ -63,6 +63,7 @@
 #include "drivers/win/cheat.h"
 #include "drivers/win/texthook.h"
 #include "drivers/win/memwatch.h"
+#include "drivers/win/tracer.h"
 #else
 #include "drivers/sdl/sdl.h"
 #endif
@@ -602,9 +603,11 @@ void FCEUI_Emulate(uint8 **pXBuf, int32 **SoundBuf, int32 *SoundBufSize, int ski
 	if (skip != 2) ssize=FlushEmulateSound(); //If skip = 2 we are skipping sound processing
 	
 #ifdef WIN32
+	//These Windows only dialogs need to be updated only once per frame so they are included here
 	UpdateCheatList();
 	UpdateTextHooker();
 	RamChange();
+	UpdateLogWindow();
 	//FCEUI_AviVideoUpdate(XBuf);
 #endif