diff -Nru MameUIs_139.3/winui/properties.c MameUIs_139.3.1/winui/properties.c
--- MameUIs_139.3/winui/properties.c	Fri Sep  3 17:57:12 2010
+++ MameUIs_139.3.1/winui/properties.c	Mon Sep 20 03:05:54 2010
@@ -385,15 +385,30 @@
 	memset(pspages, 0, sizeof(PROPSHEETPAGE) * possiblePropSheets);
 
 	maxPropSheets = 0;
-	
+
 	i = ( isGame ) ? 0 : 2;
 
 	for (; g_propSheets[i].pfnDlgProc; i++)
 	{
+		if (!gamedrv)
+		{
+			if (g_propSheets[i].bOnDefaultPage)
+			{
+				pspages[maxPropSheets].dwSize      = sizeof(PROPSHEETPAGE);
+				pspages[maxPropSheets].dwFlags     = 0;
+				pspages[maxPropSheets].hInstance   = hInst;
+				pspages[maxPropSheets].pszTemplate = MAKEINTRESOURCE(g_propSheets[i].dwDlgID);
+				pspages[maxPropSheets].pfnCallback = NULL;
+				pspages[maxPropSheets].lParam      = 0;
+				pspages[maxPropSheets].pfnDlgProc  = g_propSheets[i].pfnDlgProc;
+				maxPropSheets++;
+			}
+		}
+		else
 		if ((gamedrv != NULL) || g_propSheets[i].bOnDefaultPage)
 		{
 			machine_config config(*gamedrv);
-			
+
 			if (!gamedrv || !g_propSheets[i].pfnFilterProc || g_propSheets[i].pfnFilterProc(&config, gamedrv))
 			{
 				pspages[maxPropSheets].dwSize      = sizeof(PROPSHEETPAGE);
@@ -407,7 +422,7 @@
 			}
 		}
 	}
-	
+
 	if (pnMaxPropSheets)
 		*pnMaxPropSheets = maxPropSheets;
 
diff -Nru MameUIs_139.3/winui/treeview.c MameUIs_139.3.1/winui/treeview.c
--- MameUIs_139.3/winui/treeview.c	Fri Sep  3 19:05:56 2010
+++ MameUIs_139.3.1/winui/treeview.c	Mon Sep 20 03:05:54 2010
@@ -924,7 +924,7 @@
 	int i, j, device_folder_count = 0;
 	LPTREEFOLDER device_folders[512];
 	LPTREEFOLDER folder;
-	const device_config_execute_interface *device;
+	const device_config_execute_interface *device = NULL;
 	int nFolder = numFolders;
 
 	for (i = 0; drivers[i] != NULL; i++)
@@ -984,7 +984,7 @@
 	int i, j, device_folder_count = 0;
 	LPTREEFOLDER device_folders[512];
 	LPTREEFOLDER folder;
-	const device_config_sound_interface *device;
+	const device_config_sound_interface *device = NULL;
 	int nFolder = numFolders;
 
 	for (i = 0; drivers[i] != NULL; i++)