diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp
index ec0499d5d9..7673b323d8 100644
--- a/Windows/WndMainWindow.cpp
+++ b/Windows/WndMainWindow.cpp
@@ -744,8 +744,8 @@ namespace MainWindow
 			case ID_OPTIONS_USEVBO:
 				g_Config.bUseVBO = !g_Config.bUseVBO;
 				break;
-			case ID_OPTIONS_TEXTUREFILTERING_OFF:
-				setTexFiltering(1);
+			case ID_OPTIONS_TEXTUREFILTERING_AUTO:
+				setTexFiltering(0);
 				break;
 			case ID_OPTIONS_NEARESTFILTERING:
 				setTexFiltering(2) ;
@@ -956,13 +956,16 @@ namespace MainWindow
 		}
 
 		static const int texfilteringitems[] = {
-			ID_OPTIONS_TEXTUREFILTERING_OFF,
+			ID_OPTIONS_TEXTUREFILTERING_AUTO,
 			ID_OPTIONS_NEARESTFILTERING,
 			ID_OPTIONS_LINEARFILTERING,
 			ID_OPTIONS_LINEARFILTERING_CG,
 		};
-		for (int i = 0; i < 3; i++) {
-			CheckMenuItem(menu, texfilteringitems[i], MF_BYCOMMAND | ((i == g_Config.iTexFiltering-2) ? MF_CHECKED : MF_UNCHECKED));
+		for (int i = 0; i < 4; i++) {
+			if(i != 0)
+				CheckMenuItem(menu, texfilteringitems[i], MF_BYCOMMAND | ((i == g_Config.iTexFiltering-1) ? MF_CHECKED : MF_UNCHECKED));
+			else
+				CheckMenuItem(menu, texfilteringitems[i], MF_BYCOMMAND | ((i == g_Config.iTexFiltering) ? MF_CHECKED : MF_UNCHECKED));
 		}
 
 		UpdateCommands();
diff --git a/Windows/ppsspp.rc b/Windows/ppsspp.rc
index a4dca8df39..b123d2e19c 100644
Binary files a/Windows/ppsspp.rc and b/Windows/ppsspp.rc differ