diff --git a/packages/material-ui/src/Menu/Menu.js b/packages/material-ui/src/Menu/Menu.js
index 4fc18e1ddb71e7..1f85ef394bfc28 100644
--- a/packages/material-ui/src/Menu/Menu.js
+++ b/packages/material-ui/src/Menu/Menu.js
@@ -53,7 +53,7 @@ const Menu = React.forwardRef(function Menu(props, ref) {
...other
} = props;
- const autoFocus = autoFocusProp !== undefined ? autoFocusProp : !disableAutoFocusItem;
+ const autoFocus = (autoFocusProp !== undefined ? autoFocusProp : !disableAutoFocusItem) && open;
const menuListActionsRef = React.useRef(null);
const firstValidItemRef = React.useRef(null);
diff --git a/packages/material-ui/test/integration/Menu.test.js b/packages/material-ui/test/integration/Menu.test.js
index 3b6a08c60e32da..d89c81cf8c2a27 100644
--- a/packages/material-ui/test/integration/Menu.test.js
+++ b/packages/material-ui/test/integration/Menu.test.js
@@ -1,5 +1,5 @@
import React from 'react';
-import { assert } from 'chai';
+import { assert, expect } from 'chai';
import TestUtils from 'react-dom/test-utils';
import { createMount } from '@material-ui/core/test-utils';
import Popover from '@material-ui/core/Popover';
@@ -10,368 +10,397 @@ import { setRef } from '../../src/utils/reactHelpers';
import { stub } from 'sinon';
import PropTypes from 'prop-types';
import { createMuiTheme } from '@material-ui/core/styles';
+import { cleanup, render, fireEvent } from 'test/utils/createClientRender';
describe('