diff --git a/modules/node/node.css b/modules/node/node.css
index 95eb73496265712cceeaad78de66e7187d5b7600..029e83b8e7a8ec21d3679741e748d530c512f077 100644
--- a/modules/node/node.css
+++ b/modules/node/node.css
@@ -24,6 +24,10 @@ td.revision-current {
   display: block;
   width: 95%;
 }
+.node-form .container-inline .form-text {
+  display: inline;
+  width: auto;
+}
 .node-form .standard {
   clear: both;
 }
diff --git a/modules/system/system.css b/modules/system/system.css
index a11e3387617f4dcdfd33ecab621683ebef4faa50..2632bcf04981a5210691662883234fdf0550c9ea 100644
--- a/modules/system/system.css
+++ b/modules/system/system.css
@@ -32,9 +32,6 @@ thead th {
 .breadcrumb {
   padding-bottom: .5em
 }
-.container-inline div {
-  display: inline;
-}
 .error {
   color: #f00;
 }
@@ -152,6 +149,13 @@ dl.multiselect .form-item {
   margin: 0;
 }
 
+/*
+** Inline items (need to override above)
+*/
+.container-inline div, .container-inline label {
+  display: inline;
+}
+
 /*
 ** Tab navigation
 */