diff --git a/docs/src/pages/demos/text-fields/TextFields.js b/docs/src/pages/demos/text-fields/TextFields.js
index e02ab33b269efd..d142b88b99f4c8 100644
--- a/docs/src/pages/demos/text-fields/TextFields.js
+++ b/docs/src/pages/demos/text-fields/TextFields.js
@@ -73,6 +73,17 @@ class TextFields extends Component {
           autoComplete="current-password"
           margin="normal"
         />
+        <TextField
+          id="date"
+          label="From date"
+          type="date"
+          defaultValue="2017-05-24"
+          className={classes.textField}
+          margin="normal"
+          InputLabelProps={{
+            shrink: true,
+          }}
+        />
         <TextField
           id="multiline-flexible"
           label="Multiline"
@@ -92,17 +103,6 @@ class TextFields extends Component {
           className={classes.textField}
           margin="normal"
         />
-        <TextField
-          id="date"
-          label="From date"
-          type="date"
-          defaultValue="2017-05-24"
-          className={classes.textField}
-          margin="normal"
-          InputLabelProps={{
-            shrink: true,
-          }}
-        />
         <TextField
           id="helperText"
           label="Helper text"
@@ -111,11 +111,22 @@ class TextFields extends Component {
           helperText="Some important text"
           margin="normal"
         />
+        <TextField
+          label="With placeholder"
+          placeholder="Placeholder"
+          className={classes.textField}
+        />
+        <TextField
+          label="With placeholder multiline"
+          placeholder="Placeholder"
+          multiline
+          className={classes.textField}
+        />
         <TextField
           id="placeholder"
           label="Label"
           InputProps={{ placeholder: 'Placeholder' }}
-          helperText="Full width!!!"
+          helperText="Full width!"
           fullWidth
           margin="normal"
         />
diff --git a/src/Input/Input.js b/src/Input/Input.js
index d55e28cec1f040..55a1e91f38bf1b 100644
--- a/src/Input/Input.js
+++ b/src/Input/Input.js
@@ -114,7 +114,8 @@ export const styles = (theme: Object) => {
         // Remove the padding when type=search.
         appearance: 'none',
       },
-      'label + $formControl > &': {
+      // Show and hide the placeholder logic
+      'label + $formControl &': {
         '&::-webkit-input-placeholder': placeholderForm,
         '&::-moz-placeholder': placeholderForm, // Firefox 19+
         '&:-ms-input-placeholder': placeholderForm, // IE 11
@@ -162,7 +163,7 @@ export const styles = (theme: Object) => {
       },
     },
     multiline: {
-      padding: `${theme.spacing.unit - 2}px 0 ${theme.spacing.unit + 1}px`,
+      padding: `${theme.spacing.unit - 2}px 0 ${theme.spacing.unit - 1}px`,
     },
     inputDisabled: {
       opacity: 1, // Reset iOS opacity