diff --git a/plugins/LilyPad/Config.cpp b/plugins/LilyPad/Config.cpp
index 69a7b0da51..34e0ea46a2 100644
--- a/plugins/LilyPad/Config.cpp
+++ b/plugins/LilyPad/Config.cpp
@@ -18,6 +18,7 @@ GeneralConfig config;
 // 1 if running inside a PS2 emulator.  Set to 1 on any
 // of the PS2-specific functions (PS2EgetLibVersion2, PS2EgetLibType).
 // Only affects if I allow read input in GS thread to be set.
+// Also disables usage of AutoAnalog mode if in PS2 mode.
 u8 ps2e = 0;
 
 HWND hWndProp = 0;
@@ -1746,7 +1747,7 @@ void UpdatePadList(HWND hWnd) {
 		CheckDlgButton(hWnd, IDC_ANALOG_START1, BST_CHECKED*config.padConfigs[port][slot].autoAnalog);
 	}
 	EnableWindow(hWndCombo, enable);
-	EnableWindow(hWndAnalog, enable);
+	EnableWindow(hWndAnalog, enable && !ps2e);
 	//ListView_SetExtendedListViewStyleEx(hWndList, LVS_EX_DOUBLEBUFFER|LVS_EX_ONECLICKACTIVATE, LVS_EX_DOUBLEBUFFER|LVS_EX_ONECLICKACTIVATE);
 	recurse = 0;
 }
diff --git a/plugins/LilyPad/LilyPad.cpp b/plugins/LilyPad/LilyPad.cpp
index 1341f4f676..1b4204eb2c 100644
--- a/plugins/LilyPad/LilyPad.cpp
+++ b/plugins/LilyPad/LilyPad.cpp
@@ -713,9 +713,9 @@ void ResetPad(int port, int slot) {
 	pads[port][slot].umask[0] = pads[port][slot].umask[1] = 0xFF;
 	// Sets up vibrate variable.
 	ResetVibrate(port, slot);
-	/*if (config.padConfigs[port][slot].autoAnalog) {
+	if (config.padConfigs[port][slot].autoAnalog && !ps2e) {
 		pads[port][slot].mode = MODE_ANALOG;
-	}*/
+	}
 	pads[port][slot].initialized = 1;
 
 	pads[port][slot].enabled = enabled;
@@ -1252,9 +1252,9 @@ u8 CALLBACK PADpoll(u8 value) {
 					}
 					else {
 						pad->modeLock = 0;
-						/*if (pad->mode == MODE_DIGITAL && config.padConfigs[query.port][query.slot].autoAnalog) {
+						if (pad->mode == MODE_DIGITAL && config.padConfigs[query.port][query.slot].autoAnalog && !ps2e) {
 							pad->mode = MODE_ANALOG;
-						}*/
+						}
 					}
 					query.queryDone = 1;
 				}
diff --git a/plugins/LilyPad/LilyPad.rc b/plugins/LilyPad/LilyPad.rc
index d1ea1dd7fe..0404e1a7b8 100644
--- a/plugins/LilyPad/LilyPad.rc
+++ b/plugins/LilyPad/LilyPad.rc
@@ -236,8 +236,8 @@ BEGIN
     CONTROL         "Port 2 Multitap",IDC_MULTITAP2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,169,63,10
     CONTROL         "",IDC_PAD_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_TABSTOP,81,156,183,52,WS_EX_CLIENTEDGE
     COMBOBOX        IDC_PAD_TYPE,270,155,140,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Use analog mode whenever possible",IDC_ANALOG_START1,
-                    "Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,270,172,132,10
+    CONTROL         "Use analog mode if possible - PS1 only",IDC_ANALOG_START1,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,270,172,132,10
     GROUPBOX        "Device Diagnostics",IDC_STATIC,7,219,201,101
     CONTROL         "",IDC_LIST,"SysListView32",LVS_LIST | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_VSCROLL | WS_TABSTOP,14,231,187,65,WS_EX_CLIENTEDGE
     PUSHBUTTON      "Test Device",ID_TEST,87,300,57,15