diff --git a/__tests__/src/components/WindowTopMenu.test.js b/__tests__/src/components/WindowTopMenu.test.js
index 713cc148ef9ab3616004acdfbae2b60b8b65a5e2..3eacc72fb4360e0e3e0667da11272f4f5dc5f35f 100644
--- a/__tests__/src/components/WindowTopMenu.test.js
+++ b/__tests__/src/components/WindowTopMenu.test.js
@@ -42,8 +42,10 @@ describe('WindowTopMenu', () => {
     expect(wrapper.find(Menu).first().props().anchorEl).toBe(null);
     expect(wrapper.find(Menu).first().props().open).toBe(false);
     expect(wrapper.find(Menu).first().props().onClose).toBe(handleClose);
-    expect(wrapper.find(Menu).first().props().onEntering).toBe(toggleDraggingEnabled);
-    expect(wrapper.find(Menu).first().props().onExit).toBe(toggleDraggingEnabled);
+    expect(wrapper.find(Menu).first().props().TransitionProps.onEntering)
+      .toBe(toggleDraggingEnabled);
+    expect(wrapper.find(Menu).first().props().TransitionProps.onExit)
+      .toBe(toggleDraggingEnabled);
   });
 
   it('passses correct props to <Menu/> when achor element given', () => {
@@ -54,7 +56,9 @@ describe('WindowTopMenu', () => {
     expect(wrapper.find(Menu).first().props().anchorEl).toBe(anchorEl);
     expect(wrapper.find(Menu).first().props().open).toBe(true);
     expect(wrapper.find(Menu).first().props().onClose).toBe(handleClose);
-    expect(wrapper.find(Menu).first().props().onEntering).toBe(toggleDraggingEnabled);
-    expect(wrapper.find(Menu).first().props().onExit).toBe(toggleDraggingEnabled);
+    expect(wrapper.find(Menu).first().props().TransitionProps.onEntering)
+      .toBe(toggleDraggingEnabled);
+    expect(wrapper.find(Menu).first().props().TransitionProps.onExit)
+      .toBe(toggleDraggingEnabled);
   });
 });
diff --git a/src/components/WindowList.js b/src/components/WindowList.js
index 338b93ae6162b8b22c28546db977c60691c177e6..5e45ad0378c2ab27ed55d004a1cbe9cd551100fd 100644
--- a/src/components/WindowList.js
+++ b/src/components/WindowList.js
@@ -54,7 +54,9 @@ export class WindowList extends Component {
         anchorEl={anchorEl}
         open={Boolean(anchorEl)}
         onClose={handleClose}
-        onEntering={WindowList.focus2ndListIitem}
+        TransitionProps={{
+          onEntering: WindowList.focus2ndListIitem,
+        }}
       >
         <ListSubheader role="presentation" selected={false} disabled tabIndex="-1">
           {t('openWindows')}
diff --git a/src/components/WindowTopMenu.js b/src/components/WindowTopMenu.js
index 7998753826b5a94a65e7468e6ecc946581e7ec66..6148f94d24085780611b2ddf1e8373740104cf24 100644
--- a/src/components/WindowTopMenu.js
+++ b/src/components/WindowTopMenu.js
@@ -47,8 +47,10 @@ export class WindowTopMenu extends Component {
         getContentAnchorEl={null}
         open={Boolean(anchorEl)}
         onClose={handleClose}
-        onEntering={toggleDraggingEnabled}
-        onExit={toggleDraggingEnabled}
+        TransitionProps={{
+          onEntering: toggleDraggingEnabled,
+          onExit: toggleDraggingEnabled,
+        }}
         orientation="horizontal"
       >
         <WindowViewSettings windowId={windowId} handleClose={handleClose} />