diff --git a/src/drivers/Qt/AviRecord.cpp b/src/drivers/Qt/AviRecord.cpp
index 1845f97b..b0737761 100644
--- a/src/drivers/Qt/AviRecord.cpp
+++ b/src/drivers/Qt/AviRecord.cpp
@@ -709,7 +709,7 @@ int FCEUD_AviGetFormatOpts( std::vector <std::string> &formatList )
 				s.assign("Unknown");
 			break;
 			case AVI_RGB24:
-				s.assign("RGB 24");
+				s.assign("RGB24 (Uncompressed)");
 			break;
 			case AVI_I420:
 				s.assign("I420 (YUV 4:2:0)");
diff --git a/src/drivers/Qt/ConsoleWindow.cpp b/src/drivers/Qt/ConsoleWindow.cpp
index 071124b6..a0274c04 100644
--- a/src/drivers/Qt/ConsoleWindow.cpp
+++ b/src/drivers/Qt/ConsoleWindow.cpp
@@ -914,8 +914,8 @@ void consoleWin_t::createMainMenu(void)
 	Hotkeys[ HK_SAVE_STATE ].setAction( quickSaveAct );
 	connect( Hotkeys[ HK_SAVE_STATE ].getShortcut(), SIGNAL(activated()), this, SLOT(quickSave(void)) );
 	
-	// File -> Change State
-	subMenu = fileMenu->addMenu(tr("Change &State"));
+	// File -> Change State Slot
+	subMenu = fileMenu->addMenu(tr("Change &State Slot"));
 	group   = new QActionGroup(this);
 
 	group->setExclusive(true);
@@ -924,7 +924,7 @@ void consoleWin_t::createMainMenu(void)
 	{
 	        char stmp[8];
 
-	        sprintf( stmp, "&%i", i );
+	        sprintf( stmp, "Slot &%i", i );
 
 	        state[i] = new QAction(tr(stmp), this);
 	        state[i]->setCheckable(true);
@@ -3473,6 +3473,7 @@ void consoleWin_t::recordMovieAs(void)
 	dialog.setViewMode(QFileDialog::List);
 	dialog.setFilter( QDir::AllEntries | QDir::AllDirs | QDir::Hidden );
 	dialog.setLabelText( QFileDialog::Accept, tr("Save") );
+	dialog.setDefaultSuffix( tr(".fm2") );
 
 	g_config->getOption ("SDL.LastOpenMovie", &last );
 
@@ -4042,8 +4043,8 @@ void consoleWin_t::updatePeriodic(void)
 		openMovAct->setEnabled( FCEU_IsValidUI( FCEUI_PLAYMOVIE ) );
 		recMovAct->setEnabled( FCEU_IsValidUI( FCEUI_RECORDMOVIE ) );
 		recAsMovAct->setEnabled( FCEU_IsValidUI( FCEUI_RECORDMOVIE ) );
-		recAviAct->setEnabled( FCEU_IsValidUI( FCEUI_RECORDMOVIE ) );
-		recAsAviAct->setEnabled( FCEU_IsValidUI( FCEUI_RECORDMOVIE ) );
+		recAviAct->setEnabled( FCEU_IsValidUI( FCEUI_RECORDMOVIE ) && !FCEU_IsValidUI( FCEUI_STOPAVI ) );
+		recAsAviAct->setEnabled( FCEU_IsValidUI( FCEUI_RECORDMOVIE ) && !FCEU_IsValidUI( FCEUI_STOPAVI ) );
 		stopAviAct->setEnabled( FCEU_IsValidUI( FCEUI_STOPAVI ) );
 		recWavAct->setEnabled( FCEU_IsValidUI( FCEUI_RECORDMOVIE ) && !FCEUI_WaveRecordRunning() );
 		recAsWavAct->setEnabled( FCEU_IsValidUI( FCEUI_RECORDMOVIE ) && !FCEUI_WaveRecordRunning() );
diff --git a/src/drivers/Qt/config.cpp b/src/drivers/Qt/config.cpp
index e10b52c5..2f8ebddc 100644
--- a/src/drivers/Qt/config.cpp
+++ b/src/drivers/Qt/config.cpp
@@ -32,6 +32,7 @@
 
 #include "Qt/sdl.h"
 #include "Qt/sdl-video.h"
+#include "Qt/AviRecord.h"
 #include "Qt/unix-netplay.h"
 
 #ifdef WIN32
@@ -582,7 +583,14 @@ InitConfig()
 	config->addOption("pauseframe", "SDL.PauseFrame", 0);
 	config->addOption("recordhud", "SDL.RecordHUD", 1);
 	config->addOption("moviemsg", "SDL.MovieMsg", 1);
-	config->addOption("SDL.AviVideoFormat", 0);
+
+#ifdef _USE_X264
+	config->addOption("SDL.AviVideoFormat", AVI_X264);
+#elif  WIN32
+	config->addOption("SDL.AviVideoFormat", AVI_VFW);
+#else
+	config->addOption("SDL.AviVideoFormat", AVI_RGB24);
+#endif
 
 	// Hex Editor Options
 	config->addOption("hexEditBgColor", "SDL.HexEditBgColor", "#000000");