X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGStructureChooser.java;fp=src%2Fjalview%2Fjbgui%2FGStructureChooser.java;h=73a56152a0264b95149abfeb15501aed5616de11;hb=64f94357ebf6a7eb8cce14d6d3e62e4d159ddd78;hp=802cc0dda0d98bd7f68ac7bd5b82a6edd7b84998;hpb=abcfb92b105fb0bac6648c863c4141d691635e2a;p=jalview.git

diff --git a/src/jalview/jbgui/GStructureChooser.java b/src/jalview/jbgui/GStructureChooser.java
index 802cc0d..73a5615 100644
--- a/src/jalview/jbgui/GStructureChooser.java
+++ b/src/jalview/jbgui/GStructureChooser.java
@@ -235,10 +235,13 @@ public abstract class GStructureChooser extends JPanel implements
           mainFrame.dispose();
           break;
         case KeyEvent.VK_ENTER: // enter key
-          ok_ActionPerformed();
+          if (btn_view.isEnabled())
+          {
+            ok_ActionPerformed();
+          }
           break;
         case KeyEvent.VK_TAB: // tab key
-          btn_cancel.requestFocus();
+          btn_view.requestFocus();
         default:
           return;
         }
@@ -270,7 +273,10 @@ public abstract class GStructureChooser extends JPanel implements
           mainFrame.dispose();
           break;
         case KeyEvent.VK_ENTER: // enter key
-          ok_ActionPerformed();
+          if (btn_view.isEnabled())
+          {
+            ok_ActionPerformed();
+          }
           break;
         case KeyEvent.VK_TAB: // tab key
           btn_cancel.requestFocus();