diff --git a/application/core/Admin/ActionsMenu.php b/application/core/Admin/ActionsMenu.php
index 90cb8522..09492e3a 100644
--- a/application/core/Admin/ActionsMenu.php
+++ b/application/core/Admin/ActionsMenu.php
@@ -205,7 +205,7 @@ class ActionsMenu implements CallbackListener, ManialinkPageAnswerListener {
 			$backgroundQuad->setStyles($quadStyle, $quadSubstyle);
 			$backgroundQuad->setSize(count($this->adminMenuItems) * $itemSize * 1.15 + 2, $itemSize * $itemMarginFactorY);
 			
-			$script->addTooltip($itemQuad, $popoutFrame, Script::OPTION_TOOLTIP_ONCLICK);
+			$script->addToggle($itemQuad, $popoutFrame);
 			
 			// Add items
 			$x = -1;
@@ -273,7 +273,7 @@ class ActionsMenu implements CallbackListener, ManialinkPageAnswerListener {
 		$backgroundQuad->setStyles($quadStyle, $quadSubstyle);
 		$backgroundQuad->setSize(count($this->playerMenuItems) * $itemSize * 1.15 + 2, $itemSize * $itemMarginFactorY);
 		
-		$script->addTooltip($itemQuad, $popoutFrame, Script::OPTION_TOOLTIP_ONCLICK);
+		$script->addToggle($itemQuad, $popoutFrame);
 		
 		// Add items
 		$x = -1;
diff --git a/application/core/FML/Script/Script.php b/application/core/FML/Script/Script.php
index 7a96f526..000e749d 100644
--- a/application/core/FML/Script/Script.php
+++ b/application/core/FML/Script/Script.php
@@ -297,6 +297,12 @@ class Script {
 			return $this;
 		}
 		$toggleControl->checkId();
+		if ($mode == self::CLASS_HIDE) {
+			$toggleControl->setVisible(true);
+		}
+		else {
+			$toggleControl->setVisible(false);
+		}
 		$clickControl->setScriptEvents(true);
 		$clickControl->addClass(self::CLASS_TOGGLE);
 		$clickControl->addClass($mode);
diff --git a/application/plugins/Donations.php b/application/plugins/Donations.php
index 466eb458..9fc79a2f 100644
--- a/application/plugins/Donations.php
+++ b/application/plugins/Donations.php
@@ -191,8 +191,7 @@ class DonationPlugin implements CallbackListener, CommandListener, Plugin {
 		$itemSize = $width;
 		
 		$maniaLink = new ManiaLink(self::MLID_DONATE_WIDGET);
-		$script = new Script();
-		$maniaLink->setScript($script);
+		$script = $maniaLink->getScript();
 		
 		// Donate Menu Icon Frame
 		$frame = new Frame();
@@ -230,7 +229,7 @@ class DonationPlugin implements CallbackListener, CommandListener, Plugin {
 		
 		$popoutFrame->add($quad);
 		
-		$script->addTooltip($itemQuad, $popoutFrame, Script::OPTION_TOOLTIP_ONCLICK);
+		$script->addToggle($itemQuad, $popoutFrame);
 		
 		// Description Label
 		$descriptionFrame = new Frame();