diff --git a/Core/SaveState.cpp b/Core/SaveState.cpp
index b481e69fbd..28a5aea7f7 100644
--- a/Core/SaveState.cpp
+++ b/Core/SaveState.cpp
@@ -69,7 +69,6 @@ namespace SaveState
 
 	void SaveStart::DoState(PointerWrap &p)
 	{
-
 		// Gotta do CoreTiming first since we'll restore into it.
 		CoreTiming::DoState(p);
 
diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp
index 5b77669fdf..42c1712969 100644
--- a/UI/EmuScreen.cpp
+++ b/UI/EmuScreen.cpp
@@ -127,7 +127,7 @@ EmuScreen::~EmuScreen() {
 void EmuScreen::dialogFinished(const Screen *dialog, DialogResult result) {
 
 	// TODO: improve the way with which we got commands from PauseMenu.
-	// DR_CANCEL means "continue", DR_OK means "back to menu",
+	// DR_CANCEL means clicked on "continue", DR_OK means clicked on "back to menu",
 	// DR_YES means a message sent to PauseMenu by NativeMessageReceived.
 	if (result == DR_OK) {
 		if (g_Config.bNewUI)
@@ -136,7 +136,7 @@ void EmuScreen::dialogFinished(const Screen *dialog, DialogResult result) {
 			screenManager()->switchScreen(new MenuScreen());
 	}
 	else if (result == DR_YES) {
-		PauseScreen::Message* msg = ((PauseScreen*)dialog)->getMessage();
+		PauseScreen::Message* msg = (PauseScreen::Message*)((Screen*)dialog)->dialogData();
 		if (msg != NULL)
 		{
 			NativeMessageReceived(msg->msg, msg->value);
diff --git a/UI/MenuScreens.h b/UI/MenuScreens.h
index 17e1326f6e..18ec21b9e1 100644
--- a/UI/MenuScreens.h
+++ b/UI/MenuScreens.h
@@ -70,7 +70,7 @@ public:
 		const char *value;
 	};
 
-	Message* getMessage() const
+	virtual void *dialogData()
 	{
 		return m_data;
 	}