Index: /applications/editors/josm/plugins/alignways/src/com/tilusnet/josm/plugins/alignways/AlignWaysDialog.java
===================================================================
--- /applications/editors/josm/plugins/alignways/src/com/tilusnet/josm/plugins/alignways/AlignWaysDialog.java	(revision 27386)
+++ /applications/editors/josm/plugins/alignways/src/com/tilusnet/josm/plugins/alignways/AlignWaysDialog.java	(revision 27387)
@@ -17,4 +17,5 @@
 import javax.swing.BoxLayout;
 import javax.swing.ButtonGroup;
+import javax.swing.JCheckBoxMenuItem;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
@@ -147,5 +148,5 @@
 
         if (activeMode == true) {
-        	// we're in alignways mode 
+            // we're in alignways mode
             activateInfoPanel.setVisible(false);
             modesPanel.setVisible(true);
@@ -156,5 +157,5 @@
             dlgPane.validate();
         } else {
-        	// we're not in alignways mode 
+            // we're not in alignways mode
             activateInfoPanel.setVisible(true);
             modesPanel.setVisible(false);
@@ -168,4 +169,8 @@
     }
 
+    public JCheckBoxMenuItem getWindowMenuItem() {
+        return windowMenuItem;
+    }
+
 
 }
Index: /applications/editors/josm/plugins/alignways/src/com/tilusnet/josm/plugins/alignways/AlignWaysMode.java
===================================================================
--- /applications/editors/josm/plugins/alignways/src/com/tilusnet/josm/plugins/alignways/AlignWaysMode.java	(revision 27386)
+++ /applications/editors/josm/plugins/alignways/src/com/tilusnet/josm/plugins/alignways/AlignWaysMode.java	(revision 27387)
@@ -7,6 +7,4 @@
 
 import java.awt.Cursor;
-import java.awt.Dimension;
-import java.awt.Image;
 import java.awt.Point;
 import java.awt.event.ActionEvent;
@@ -17,5 +15,4 @@
 import javax.swing.BorderFactory;
 import javax.swing.ImageIcon;
-import javax.swing.JButton;
 import javax.swing.JDialog;
 import javax.swing.JOptionPane;
@@ -91,5 +88,5 @@
         IconToggleButton optBtn = AlignWaysPlugin.getOptBtn();
         if (optBtn.isSelected()) {
-            // The option panel is switched off
+            // The option panel will be switched off
             optBtn.doClick();
         }
@@ -197,6 +194,6 @@
         AlignWaysTipsPanel atp = new AlignWaysTipsPanel();
         Object[] okButton = {tr("I''m ready!")};
-        JOptionPane tipPane = new JOptionPane(atp, JOptionPane.PLAIN_MESSAGE, JOptionPane.DEFAULT_OPTION, 
-				 						      null, okButton, okButton[0]);
+        JOptionPane tipPane = new JOptionPane(atp, JOptionPane.PLAIN_MESSAGE, JOptionPane.DEFAULT_OPTION,
+                null, okButton, okButton[0]);
         tipPane.setBorder(BorderFactory.createEmptyBorder(10, 10, 30, 10));
         JDialog tipDialog = tipPane.createDialog(Main.parent, tr("AlignWays Tips"));
Index: /applications/editors/josm/plugins/alignways/src/com/tilusnet/josm/plugins/alignways/AlignWaysPlugin.java
===================================================================
--- /applications/editors/josm/plugins/alignways/src/com/tilusnet/josm/plugins/alignways/AlignWaysPlugin.java	(revision 27386)
+++ /applications/editors/josm/plugins/alignways/src/com/tilusnet/josm/plugins/alignways/AlignWaysPlugin.java	(revision 27387)
@@ -39,4 +39,6 @@
         alignWaysMenuItem = MainMenu.add(Main.main.menu.toolsMenu, awAction);
         awDialog = new AlignWaysDialog(awMode);
+        // Prevent user clicking on the Windows menu entry while panel is meaningless
+        awDialog.getWindowMenuItem().setEnabled(false);
     }
 
@@ -48,4 +50,6 @@
         if (Main.map != null) {
             Main.map.addMapMode(btn);
+            // Re-enable menu item in Windows menu
+            awDialog.getWindowMenuItem().setEnabled(true);
         }
     }