diff --git a/desmume/src/GPU_osd.cpp b/desmume/src/GPU_osd.cpp
index 8ba060040..116d93e6d 100644
--- a/desmume/src/GPU_osd.cpp
+++ b/desmume/src/GPU_osd.cpp
@@ -36,7 +36,7 @@
 #include "mic.h"
 #include "saves.h"
 
-
+bool HudEditorMode = false;
 OSDCLASS	*osd = NULL;
 HudStruct Hud;
 
@@ -101,34 +101,39 @@ void HudClickRelease(HudStruct *hudstruct) {
 	}
 }
 
-void ResetHud(HudStruct *hudstruct) {
+void HudStruct::reset()
+{
+	FpsDisplay.x=0;
+	FpsDisplay.y=5;
+	FpsDisplay.xsize=120;
+	FpsDisplay.ysize=10;
 
-	hudstruct->FpsDisplay.x=0;
-	hudstruct->FpsDisplay.y=5;
-	hudstruct->FpsDisplay.xsize=120;
-	hudstruct->FpsDisplay.ysize=10;
+	FrameCounter.x=0;
+	FrameCounter.y=25;
+	FrameCounter.xsize=60;
+	FrameCounter.ysize=10;
 
-	hudstruct->FrameCounter.x=0;
-	hudstruct->FrameCounter.y=25;
-	hudstruct->FrameCounter.xsize=60;
-	hudstruct->FrameCounter.ysize=10;
+	InputDisplay.x=0;
+	InputDisplay.y=45;
+	InputDisplay.xsize=120;
+	InputDisplay.ysize=10;
 
-	hudstruct->InputDisplay.x=0;
-	hudstruct->InputDisplay.y=45;
-	hudstruct->InputDisplay.xsize=120;
-	hudstruct->InputDisplay.ysize=10;
-
-	hudstruct->LagFrameCounter.x=0;
-	hudstruct->LagFrameCounter.y=65;
-	hudstruct->LagFrameCounter.xsize=30;
-	hudstruct->LagFrameCounter.ysize=10;
+	LagFrameCounter.x=0;
+	LagFrameCounter.y=65;
+	LagFrameCounter.xsize=30;
+	LagFrameCounter.ysize=10;
 	
-	hudstruct->Microphone.x=0;
-	hudstruct->Microphone.y=85;
-	hudstruct->Microphone.xsize=20;
-	hudstruct->Microphone.ysize=10;
+	Microphone.x=0;
+	Microphone.y=85;
+	Microphone.xsize=20;
+	Microphone.ysize=10;
 
-	SetHudDummy(&hudstruct->Dummy);
+	SavestateSlots.x = 8;
+	SavestateSlots.y = 160;
+	SavestateSlots.xsize = 240;
+	SavestateSlots.ysize = 24;
+
+	SetHudDummy(&Dummy);
 }
 
 
@@ -170,32 +175,42 @@ static void TouchDisplay() {
 		}
 }
 
-static int yheight;
-static int xpos;
 static int previousslot = 0;
 static int fadecounter;
 static char number[10];
 
 static void DrawStateSlots(){
 
-	aggDraw.hud->lineWidth(1.0);
-	aggDraw.hud->lineColor(0, 0, 0, fadecounter);
-	aggDraw.hud->fillColor(255, 255, 255, fadecounter);
+	const int yloc = Hud.SavestateSlots.y; //160
+	const int xloc = Hud.SavestateSlots.x; //8
 
-	for ( int i = 0; i < 10; xpos=xpos+24) {
 
-		aggDraw.hud->fillLinearGradient(8 + xpos, 160 - yheight, 30 + xpos, 180 + yheight+20, agg::rgba8(100,200,255,fadecounter), agg::rgba8(255,255,255,0));
-		
-		if(lastSaveState == i) {
-			yheight = 5;
-			aggDraw.hud->fillLinearGradient(8 + xpos, 160 - yheight, 30 + xpos, 180 + yheight+20, agg::rgba8(100,255,255,fadecounter), agg::rgba8(255,255,255,0));
+	int alpha = fadecounter;
+	if(HudEditorMode)
+		alpha = 255;
+
+	if(alpha!=0)
+	{
+		aggDraw.hud->lineWidth(1.0);
+		aggDraw.hud->lineColor(0, 0, 0, alpha);
+		aggDraw.hud->fillColor(255, 255, 255, alpha);
+
+		for ( int i = 0, xpos=0; i < 10; xpos=xpos+24) {
+
+			int yheight=0;
+
+			aggDraw.hud->fillLinearGradient(xloc + xpos, yloc - yheight, xloc + 22 + xpos, yloc + 20 + yheight+20, agg::rgba8(100,200,255,alpha), agg::rgba8(255,255,255,0));
+
+			if(lastSaveState == i) {
+				yheight = 5;
+				aggDraw.hud->fillLinearGradient(xloc + xpos, yloc - yheight, 22 + xloc + xpos, yloc + 20 + yheight+20, agg::rgba8(100,255,255,alpha), agg::rgba8(255,255,255,0));
+			}
+
+			aggDraw.hud->rectangle(xloc + xpos , yloc - yheight, xloc + 22 + xpos , yloc + 20 + yheight);
+			snprintf(number, 10, "%d", i);
+			aggDraw.hud->renderText(xloc + 1 + xpos + 4, yloc+4, std::string(number));
+			i++;
 		}
-
-		aggDraw.hud->rectangle(8 + xpos , 160 - yheight, 30 + xpos , 180 + yheight);
-		snprintf(number, 10, "%d", i);
-		aggDraw.hud->renderText(9 + xpos + 4, 164, std::string(number));
-		i++;
-		yheight=0;
 	}
 
 	if(lastSaveState != previousslot) fadecounter = 256;
@@ -203,8 +218,6 @@ static void DrawStateSlots(){
 	fadecounter--;
 
 	if(fadecounter < 1) fadecounter = 0;
-
-	xpos = 0;
 }
 #ifdef WIN32
 #include "lua-engine.h"
diff --git a/desmume/src/GPU_osd.h b/desmume/src/GPU_osd.h
index fb0dc9cb0..16f55ded7 100644
--- a/desmume/src/GPU_osd.h
+++ b/desmume/src/GPU_osd.h
@@ -52,6 +52,7 @@ public:
 		, fps3d(0)
 	{}
 
+	HudCoordinates SavestateSlots;
 	HudCoordinates FpsDisplay;
 	HudCoordinates FrameCounter;
 	HudCoordinates InputDisplay;
@@ -60,6 +61,7 @@ public:
 	HudCoordinates Dummy;
 
 	HudCoordinates &hud(int i) { return ((HudCoordinates*)this)[i]; }
+	void reset();
 
 	int fps, fps3d;
 };
@@ -71,6 +73,7 @@ void HudClickRelease(HudStruct *hudstruct);
 void DrawHUD();
 
 extern HudStruct Hud;
+extern bool HudEditorMode;
 
 class OSDCLASS
 {
diff --git a/desmume/src/windows/main.cpp b/desmume/src/windows/main.cpp
index 618579404..606d5df70 100644
--- a/desmume/src/windows/main.cpp
+++ b/desmume/src/windows/main.cpp
@@ -264,7 +264,6 @@ int emu_paused = 0;
 bool frameAdvance = false;
 bool staterewindingenabled = false;
 
-bool HudEditorMode = false;
 bool UseMicSample = false;
 unsigned short windowSize = 0;
 
@@ -1562,7 +1561,7 @@ int _main()
 
 
 	InitCustomKeys(&CustomKeys);
-	ResetHud(&Hud);
+	Hud.reset();
 
 	void input_init();
 	input_init();
@@ -3362,7 +3361,7 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
 			return 0;
 
 		case ID_VIEW_HUDEDITOR:
-			HudEditorMode ^= 1;
+			HudEditorMode ^= true;
 			MainWindow->checkMenu(ID_VIEW_HUDEDITOR, HudEditorMode ? MF_CHECKED : MF_UNCHECKED);
 			osd->clear();
 			osd->border(HudEditorMode);