Merge remote-tracking branch 'runelite/master'

runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java

@@ -230,7 +230,6 @@ public class ClientUI
 					currentButton.setSelected(false);
 					currentNavButton.setSelected(false);
 					currentButton = null;
-					currentNavButton = null;
 				}
 				else
 				{
@@ -403,7 +402,6 @@ public class ClientUI
 					toggleSidebar();
 				}
 			};
-
 			sidebarListener.setEnabledOnLogin(true);
 			keyManager.registerKeyListener(sidebarListener);
 
@@ -415,7 +413,7 @@ public class ClientUI
 					togglePluginPanel();
 				}
 			};
-
+			pluginPanelListener.setEnabledOnLogin(true);
 			keyManager.registerKeyListener(pluginPanelListener);
 
 			// Add mouse listener
@@ -433,7 +431,6 @@ public class ClientUI
 					return mouseEvent;
 				}
 			};
-
 			mouseManager.registerMouseListener(mouseListener);
 
 			// Decorate window with custom chrome and titlebar if needed

runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java

@@ -135,8 +135,12 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener
 	{
 		if (!event.isFocused())
 		{
-			inOverlayManagingMode = false;
-			resetOverlayManagementMode();
+			if (inOverlayManagingMode)
+			{
+				inOverlayManagingMode = false;
+				resetOverlayManagementMode();
+			}
+
 			inMenuEntryMode = false;
 			menuEntries = null;
 		}
@@ -616,7 +620,7 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener
 	@Override
 	public void keyReleased(KeyEvent e)
 	{
-		if (!e.isAltDown())
+		if (!e.isAltDown() && inOverlayManagingMode)
 		{
 			inOverlayManagingMode = false;
 			resetOverlayManagementMode();