diff --git a/src/main/java/com/ardublock/ui/OpenblocksFrame.java b/src/main/java/com/ardublock/ui/OpenblocksFrame.java
index f42005161df0d286012cb65670d5d6da75aaa24b..608bee30ae6efc320e33701cc12676879d5a4bfe 100644
--- a/src/main/java/com/ardublock/ui/OpenblocksFrame.java
+++ b/src/main/java/com/ardublock/ui/OpenblocksFrame.java
@@ -578,7 +578,7 @@ public class OpenblocksFrame extends JFrame
 			        simulateMenuItem.setVisible(false);
 			        simulateMenuItem.unregisterKeyboardAction(ctrluKeyStroke);
 			        //helpButton.setVisible(false);
-			        helpButton.removeActionListener(simulatorHelpButtonListener);
+			        removeAllActionListeners(helpButton);
 			        helpButton.addActionListener(helpButtonListener);
 					helpButton.setToolTipText(uiMessageBundle.getString("ardublock.ui.help.tooltip"));
 			        serialMonitorButton.setVisible(true);
@@ -649,7 +649,7 @@ public class OpenblocksFrame extends JFrame
 			        simulateMenuItem.setVisible(false);
 			        simulateMenuItem.unregisterKeyboardAction(ctrluKeyStroke);
 			        //helpButton.setVisible(false);
-			        helpButton.removeActionListener(simulatorHelpButtonListener);
+			        removeAllActionListeners(helpButton);
 			        helpButton.addActionListener(helpButtonListener);
 					helpButton.setToolTipText(uiMessageBundle.getString("ardublock.ui.help.tooltip"));
 			        serialMonitorButton.setVisible(true);
@@ -718,8 +718,9 @@ public class OpenblocksFrame extends JFrame
 				    simulateMenuItem.setVisible(true);
 				    simulateMenuItem.registerKeyboardAction(simulateButtonListener, ctrluKeyStroke, JComponent.WHEN_IN_FOCUSED_WINDOW);
 				    //helpButton.setVisible(true);
-				    helpButton.removeActionListener(helpButtonListener);
+				    removeAllActionListeners(helpButton);
 				    helpButton.addActionListener(simulatorHelpButtonListener);
+				    helpButton.addActionListener(helpButtonListener);
 					helpButton.setToolTipText(uiMessageBundle.getString("ardublock.ui.simulatorHelp.tooltip"));
 				    serialMonitorButton.setVisible(false);
 				    serialPlotterButton.setVisible(false);
@@ -1380,6 +1381,12 @@ public class OpenblocksFrame extends JFrame
 		return workspaceModeState; 
 	}
 	
+	private void removeAllActionListeners(JButton button) { //letsgoING
+		for( ActionListener al : button.getActionListeners() ) {
+			button.removeActionListener( al );
+	    }
+	}
+	
 	//TODO: TESTTESTTEST
 	private void addLibrary(String libraryName) 
 	{