diff --git a/js/discrete/view/DiscreteControlPanel.js b/js/discrete/view/DiscreteControlPanel.js
index df07e3da..8a1592c7 100644
--- a/js/discrete/view/DiscreteControlPanel.js
+++ b/js/discrete/view/DiscreteControlPanel.js
@@ -121,7 +121,6 @@ class DiscreteControlPanel extends Panel {
       touchAreaDilation: 15,
       tandem: options.tandem.createTandem( 'infoButton' )
     } );
-    infoDialog.setFocusOnCloseNode( infoButton );
 
     const content = new Node( {
       children: [ vBox, infoButton ]
diff --git a/js/discrete/view/DiscreteScreenView.js b/js/discrete/view/DiscreteScreenView.js
index e5cb8864..bd075aee 100644
--- a/js/discrete/view/DiscreteScreenView.js
+++ b/js/discrete/view/DiscreteScreenView.js
@@ -198,7 +198,6 @@ class DiscreteScreenView extends ScreenView {
       tandem: sumEquationNodeTandem.createTandem( 'expandedFormButton' ),
       phetioDocumentation: 'Pressing this button opens a dialog that shows the expanded form of the Sum equation.'
     } );
-    expandedFormDialog.setFocusOnCloseNode( expandedFormButton );
 
     const sumEquationParentNode = new Node( {
       children: [ sumEquationNode, expandedFormButton ]
diff --git a/js/wavepacket/view/WavePacketControlPanel.js b/js/wavepacket/view/WavePacketControlPanel.js
index b4d318eb..bfe30df2 100644
--- a/js/wavepacket/view/WavePacketControlPanel.js
+++ b/js/wavepacket/view/WavePacketControlPanel.js
@@ -130,7 +130,6 @@ class WavePacketControlPanel extends Panel {
       touchAreaDilation: 15,
       tandem: options.tandem.createTandem( 'infoButton' )
     } );
-    infoDialog.setFocusOnCloseNode( infoButton );
 
     const content = new Node( {
       children: [ vBox, infoButton ]