diff -r 39b9b86ec452 -r 19d37cb9c96c ui/motif/window.c
--- a/ui/motif/window.c	Sat Mar 22 15:34:20 2014 +0100
+++ b/ui/motif/window.c	Sat Mar 22 19:45:44 2014 +0100
@@ -56,12 +56,9 @@
     Arg args[16];
     int n = 0;
     
-    XtSetArg(args[n], XmNtitle, title);
-    n++;
-    XtSetArg(args[n], XmNbaseWidth, window_default_width);
-    n++;
-    XtSetArg(args[n], XmNbaseHeight, window_default_height);
-    n++;
+    XtSetArg(args[0], XmNtitle, title);
+    XtSetArg(args[1], XmNbaseWidth, window_default_width);
+    XtSetArg(args[2], XmNbaseHeight, window_default_height);
     
     Widget toplevel = XtAppCreateShell(
             "Test123",
@@ -70,7 +67,7 @@
             vendorShellWidgetClass,
             ui_get_display(),
             args,
-            n);
+            3);
     
     Atom wm_delete_window;
     wm_delete_window = XmInternAtom(
@@ -104,12 +101,18 @@
     // window content
     XtSetArg(args[0], XmNshadowType, XmSHADOW_ETCHED_OUT);
     XtSetArg(args[1], XmNshadowThickness, 0);
-    XtSetArg(args[2], XmNtopAttachment, XmATTACH_WIDGET);
-    XtSetArg(args[3], XmNtopWidget, toolbar);
-    XtSetArg(args[4], XmNleftAttachment, XmATTACH_FORM);
-    XtSetArg(args[5], XmNrightAttachment, XmATTACH_FORM);
-    XtSetArg(args[6], XmNbottomAttachment, XmATTACH_FORM);
-    Widget frame = XmCreateFrame(form, "toolbar_frame", args, 7);
+    XtSetArg(args[2], XmNleftAttachment, XmATTACH_FORM);
+    XtSetArg(args[3], XmNrightAttachment, XmATTACH_FORM);
+    XtSetArg(args[4], XmNbottomAttachment, XmATTACH_FORM);
+    if(toolbar) {
+        XtSetArg(args[5], XmNtopAttachment, XmATTACH_WIDGET);
+        XtSetArg(args[6], XmNtopWidget, toolbar);
+        n = 7;
+    } else {
+        XtSetArg(args[5], XmNtopAttachment, XmATTACH_FORM);
+        n = 6;
+    }
+    Widget frame = XmCreateFrame(form, "toolbar_frame", args, n);
     XtManageChild(frame);
     
     obj->container = ui_frame_container(obj, frame);