diff --git a/docs/src/pages/components/text-fields/CustomizedInputBase.js b/docs/src/pages/components/text-fields/CustomizedInputBase.js
index 0fb6c6742aa7bb..f3b85a6f6d48b4 100644
--- a/docs/src/pages/components/text-fields/CustomizedInputBase.js
+++ b/docs/src/pages/components/text-fields/CustomizedInputBase.js
@@ -32,7 +32,7 @@ export default function CustomizedInputBase() {
   const classes = useStyles();
 
   return (
-    <Paper className={classes.root}>
+    <Paper component="form" className={classes.root}>
       <IconButton className={classes.iconButton} aria-label="menu">
         <MenuIcon />
       </IconButton>
@@ -41,7 +41,7 @@ export default function CustomizedInputBase() {
         placeholder="Search Google Maps"
         inputProps={{ 'aria-label': 'search google maps' }}
       />
-      <IconButton className={classes.iconButton} aria-label="search">
+      <IconButton type="submit" className={classes.iconButton} aria-label="search">
         <SearchIcon />
       </IconButton>
       <Divider className={classes.divider} orientation="vertical" />
diff --git a/docs/src/pages/components/text-fields/CustomizedInputBase.tsx b/docs/src/pages/components/text-fields/CustomizedInputBase.tsx
index 538dd676aeaa98..a263ba802160ff 100644
--- a/docs/src/pages/components/text-fields/CustomizedInputBase.tsx
+++ b/docs/src/pages/components/text-fields/CustomizedInputBase.tsx
@@ -34,7 +34,7 @@ export default function CustomizedInputBase() {
   const classes = useStyles();
 
   return (
-    <Paper className={classes.root}>
+    <Paper component="form" className={classes.root}>
       <IconButton className={classes.iconButton} aria-label="menu">
         <MenuIcon />
       </IconButton>
@@ -43,7 +43,7 @@ export default function CustomizedInputBase() {
         placeholder="Search Google Maps"
         inputProps={{ 'aria-label': 'search google maps' }}
       />
-      <IconButton className={classes.iconButton} aria-label="search">
+      <IconButton type="submit" className={classes.iconButton} aria-label="search">
         <SearchIcon />
       </IconButton>
       <Divider className={classes.divider} orientation="vertical" />
diff --git a/packages/material-ui/src/Paper/Paper.d.ts b/packages/material-ui/src/Paper/Paper.d.ts
index b134f046f3590a..02de56d3608e70 100644
--- a/packages/material-ui/src/Paper/Paper.d.ts
+++ b/packages/material-ui/src/Paper/Paper.d.ts
@@ -3,7 +3,7 @@ import { StandardProps } from '..';
 
 export interface PaperProps
   extends StandardProps<React.HTMLAttributes<HTMLDivElement>, PaperClassKey> {
-  component?: React.ElementType<React.HTMLAttributes<HTMLDivElement>>;
+  component?: React.ElementType<React.HTMLAttributes<HTMLElement>>;
   elevation?: number;
   square?: boolean;
 }