diff --git a/packages/docusaurus-theme-classic/src/theme/DocItem/index.js b/packages/docusaurus-theme-classic/src/theme/DocItem/index.js
index 0c7ae733ff..ff4dea2dac 100644
--- a/packages/docusaurus-theme-classic/src/theme/DocItem/index.js
+++ b/packages/docusaurus-theme-classic/src/theme/DocItem/index.js
@@ -53,6 +53,9 @@ function DocItem(props) {
         {description && (
           <meta property="og:description" content={description} />
         )}
+        {keywords && keywords.length && (
+          <meta name="keywords" content={keywords.join(',')} />
+        )}
         {metaImage && (
           <meta
             property="og:image"
@@ -69,9 +72,6 @@ function DocItem(props) {
           <meta name="twitter:image:alt" content={`Image for ${title}`} />
         )}
         {permalink && <meta property="og:url" content={siteUrl + permalink} />}
-        {keywords && keywords.length && (
-          <meta property="keywords" content={keywords.join(',')} />
-        )}
       </Head>
       <div className="padding-vert--lg">
         <div className="container">
diff --git a/packages/docusaurus-theme-classic/src/theme/Layout/index.js b/packages/docusaurus-theme-classic/src/theme/Layout/index.js
index ea5a26c15f..6032ee745a 100644
--- a/packages/docusaurus-theme-classic/src/theme/Layout/index.js
+++ b/packages/docusaurus-theme-classic/src/theme/Layout/index.js
@@ -48,7 +48,7 @@ function Layout(props) {
           <meta property="og:description" content={description} />
         )}
         {keywords && keywords.length && (
-          <meta property="keywords" content={keywords.join(',')} />
+          <meta name="keywords" content={keywords.join(',')} />
         )}
         {metaImage && (
           <meta