diff --git a/Mage.Client/src/main/java/mage/client/MageFrame.form b/Mage.Client/src/main/java/mage/client/MageFrame.form
index de5ca825483..e09247ea97b 100644
--- a/Mage.Client/src/main/java/mage/client/MageFrame.form
+++ b/Mage.Client/src/main/java/mage/client/MageFrame.form
@@ -82,6 +82,7 @@
               <Image iconType="3" name="/menu/preferences.png"/>
             </Property>
             <Property name="text" type="java.lang.String" value="Preferences"/>
+            <Property name="toolTipText" type="java.lang.String" value="Change the settings for the different areas of XMage."/>
             <Property name="focusable" type="boolean" value="false"/>
             <Property name="horizontalTextPosition" type="int" value="4"/>
             <Property name="verticalTextPosition" type="int" value="3"/>
@@ -122,6 +123,7 @@
               <Image iconType="3" name="/menu/deck_editor.png"/>
             </Property>
             <Property name="text" type="java.lang.String" value="Deck Editor"/>
+            <Property name="toolTipText" type="java.lang.String" value="Start the deck editor to create or modify decks."/>
             <Property name="focusable" type="boolean" value="false"/>
             <Property name="horizontalTextPosition" type="int" value="4"/>
             <Property name="verticalTextPosition" type="int" value="3"/>
@@ -138,6 +140,7 @@
               <Image iconType="3" name="/menu/collection.png"/>
             </Property>
             <Property name="text" type="java.lang.String" value="Viewer"/>
+            <Property name="toolTipText" type="java.lang.String" value="Card viewer to show the cards of sets. "/>
             <Property name="focusable" type="boolean" value="false"/>
             <Property name="horizontalTextPosition" type="int" value="4"/>
             <Property name="verticalTextPosition" type="int" value="3"/>
@@ -154,6 +157,7 @@
               <Image iconType="3" name="/menu/feedback.png"/>
             </Property>
             <Property name="text" type="java.lang.String" value="Feedback"/>
+            <Property name="toolTipText" type="java.lang.String" value="Send some feedback to the developers."/>
             <Property name="focusable" type="boolean" value="false"/>
             <Property name="horizontalTextPosition" type="int" value="4"/>
             <Property name="verticalTextPosition" type="int" value="3"/>
@@ -204,6 +208,7 @@
               <Image iconType="3" name="/menu/about.png"/>
             </Property>
             <Property name="text" type="java.lang.String" value="About"/>
+            <Property name="toolTipText" type="java.lang.String" value="Some information about the developers."/>
             <Property name="focusable" type="boolean" value="false"/>
             <Property name="horizontalTextPosition" type="int" value="4"/>
             <Property name="verticalTextPosition" type="int" value="3"/>
diff --git a/Mage.Client/src/main/java/mage/client/MageFrame.java b/Mage.Client/src/main/java/mage/client/MageFrame.java
index c6eec4f6d83..2f252fce7f1 100644
--- a/Mage.Client/src/main/java/mage/client/MageFrame.java
+++ b/Mage.Client/src/main/java/mage/client/MageFrame.java
@@ -879,6 +879,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
 
         btnPreferences.setIcon(new javax.swing.ImageIcon(getClass().getResource("/menu/preferences.png"))); // NOI18N
         btnPreferences.setText("Preferences");
+        btnPreferences.setToolTipText("Change the settings for the different areas of XMage.");
         btnPreferences.setFocusable(false);
         btnPreferences.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
         btnPreferences.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
@@ -911,6 +912,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
 
         btnDeckEditor.setIcon(new javax.swing.ImageIcon(getClass().getResource("/menu/deck_editor.png"))); // NOI18N
         btnDeckEditor.setText("Deck Editor");
+        btnDeckEditor.setToolTipText("Start the deck editor to create or modify decks.");
         btnDeckEditor.setFocusable(false);
         btnDeckEditor.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
         btnDeckEditor.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
@@ -924,6 +926,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
 
         btnCollectionViewer.setIcon(new javax.swing.ImageIcon(getClass().getResource("/menu/collection.png"))); // NOI18N
         btnCollectionViewer.setText("Viewer");
+        btnCollectionViewer.setToolTipText("Card viewer to show the cards of sets. ");
         btnCollectionViewer.setFocusable(false);
         btnCollectionViewer.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
         btnCollectionViewer.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
@@ -937,6 +940,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
 
         btnSendFeedback.setIcon(new javax.swing.ImageIcon(getClass().getResource("/menu/feedback.png"))); // NOI18N
         btnSendFeedback.setText("Feedback");
+        btnSendFeedback.setToolTipText("Send some feedback to the developers.");
         btnSendFeedback.setFocusable(false);
         btnSendFeedback.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
         btnSendFeedback.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
@@ -978,6 +982,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
 
         btnAbout.setIcon(new javax.swing.ImageIcon(getClass().getResource("/menu/about.png"))); // NOI18N
         btnAbout.setText("About");
+        btnAbout.setToolTipText("Some information about the developers.");
         btnAbout.setFocusable(false);
         btnAbout.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
         btnAbout.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
@@ -1116,9 +1121,9 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
         if (setActive) {
             setActive(tablesPane);
         } else // if other panel was already shown, mamke sure it's topmost again
-        if (topPanebefore != null) {
-            setActive(topPanebefore);
-        }
+         if (topPanebefore != null) {
+                setActive(topPanebefore);
+            }
     }
 
     public void hideGames() {