diff --git a/new/button_windows.c b/new/button_windows.c
index a257e15..9d3ae65 100644
--- a/new/button_windows.c
+++ b/new/button_windows.c
@@ -72,6 +72,8 @@ uiControl *uiNewButton(const char *text)
 
 	p.dwExStyle = 0;
 	p.lpClassName = L"button";
+	wtext = toUTF16(text);
+	p.lpWindowName = wtext;
 	p.dwStyle = BS_PUSHBUTTON | WS_TABSTOP;
 	p.hInstance = hInstance;
 	p.onWM_COMMAND = onWM_COMMAND;
@@ -81,12 +83,9 @@ uiControl *uiNewButton(const char *text)
 	p.preferredSize = preferredSize;
 	p.data = b;
 	b->c = uiWindowsNewControl(&p);
+	uiFree(wtext);
 
 	hwnd = (HWND) uiControlHandle(b->c);
-	wtext = toUTF16(text);
-	if (SetWindowTextW(hwnd, wtext) == 0)
-		logLastError("error setting button text in uiNewButton()");
-	uiFree(wtext);
 	SendMessageW(hwnd, WM_SETFONT, (WPARAM) hMessageFont, (LPARAM) TRUE);
 
 	b->onClicked = defaultOnClicked;
diff --git a/new/newcontrol_windows.c b/new/newcontrol_windows.c
index 1293f5a..ce7bad4 100644
--- a/new/newcontrol_windows.c
+++ b/new/newcontrol_windows.c
@@ -90,7 +90,7 @@ uiControl *uiWindowsNewControl(uiWindowsNewControlParams *p)
 
 	c = uiNew(uiSingleHWNDControl);
 	c->hwnd = CreateWindowExW(p->dwExStyle,
-		p->lpClassName, L"",
+		p->lpClassName, p->lpWindowName,
 		p->dwStyle | WS_CHILD | WS_VISIBLE,
 		0, 0,
 		100, 100,
diff --git a/new/ui_windows.h b/new/ui_windows.h
index c86e6a9..3a4ebd9 100644
--- a/new/ui_windows.h
+++ b/new/ui_windows.h
@@ -13,7 +13,7 @@ struct uiWindowsNewControlParams {
 	// These match the CreateWindowExW() function.
 	DWORD dwExStyle;
 	LPCWSTR lpClassName;
-//TODO?	LPCWSTR lpWindowName;
+	LPCWSTR lpWindowName;
 	DWORD dwStyle;		// WS_CHILD and WS_VISIBLE are automatically applied.
 	HINSTANCE hInstance;