X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGStructureChooser.java;fp=src%2Fjalview%2Fjbgui%2FGStructureChooser.java;h=133402170a3e5bdb06c20a7d5b35532d6fea85b6;hb=dd87fa6e6c935710314ccd705097dbcada97b87c;hp=cf80613b912f5af47692bcd276a0b92db1056351;hpb=3bbfc53f15f39c6a7b9df741bdabda7f0c1447f4;p=jalview.git

diff --git a/src/jalview/jbgui/GStructureChooser.java b/src/jalview/jbgui/GStructureChooser.java
index cf80613..1334021 100644
--- a/src/jalview/jbgui/GStructureChooser.java
+++ b/src/jalview/jbgui/GStructureChooser.java
@@ -243,12 +243,13 @@ public abstract class GStructureChooser extends JPanel implements
         case KeyEvent.VK_TAB: // tab key
           if (evt.isShiftDown())
           {
-            chk_invertFilter.requestFocus();
+            pnl_filter.requestFocus();
           }
           else
           {
             btn_view.requestFocus();
           }
+          evt.consume();
           break;
         default:
           return;
@@ -293,9 +294,16 @@ public abstract class GStructureChooser extends JPanel implements
           }
           else
           {
+            if (btn_view.isEnabled())
+            {
             btn_view.requestFocus();
+            }
+            else
+            {
+              btn_cancel.requestFocus();
+            }
           }
-
+          evt.consume();
         default:
           return;
         }