diff --git a/src/net/apocalypselabs/symat/Graph.java b/src/net/apocalypselabs/symat/Graph.java
index f55982f..6fd2358 100644
--- a/src/net/apocalypselabs/symat/Graph.java
+++ b/src/net/apocalypselabs/symat/Graph.java
@@ -360,6 +360,7 @@ public class Graph extends javax.swing.JInternalFrame {
                 for (Component mu : jMenuBar1.getComponents()) {
                     mu.setEnabled(true);
                 }
+                inBox.requestFocusInWindow();
             }
 
         }
diff --git a/src/net/apocalypselabs/symat/Interpreter.form b/src/net/apocalypselabs/symat/Interpreter.form
index 0b46dce..dcf3004 100644
--- a/src/net/apocalypselabs/symat/Interpreter.form
+++ b/src/net/apocalypselabs/symat/Interpreter.form
@@ -118,6 +118,7 @@
   </SyntheticProperties>
   <Events>
     <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="formMouseClicked"/>
+    <EventHandler event="focusGained" listener="java.awt.event.FocusListener" parameters="java.awt.event.FocusEvent" handler="formFocusGained"/>
   </Events>
   <AuxValues>
     <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
diff --git a/src/net/apocalypselabs/symat/Interpreter.java b/src/net/apocalypselabs/symat/Interpreter.java
index 8eb51d3..8b09746 100644
--- a/src/net/apocalypselabs/symat/Interpreter.java
+++ b/src/net/apocalypselabs/symat/Interpreter.java
@@ -160,6 +160,11 @@ public class Interpreter extends javax.swing.JInternalFrame {
                 formMouseClicked(evt);
             }
         });
+        addFocusListener(new java.awt.event.FocusAdapter() {
+            public void focusGained(java.awt.event.FocusEvent evt) {
+                formFocusGained(evt);
+            }
+        });
 
         mainBox.setEditable(false);
         mainBox.setColumns(20);
@@ -432,6 +437,10 @@ public class Interpreter extends javax.swing.JInternalFrame {
         commandsForExport = "";
     }//GEN-LAST:event_clearBtnActionPerformed
 
+    private void formFocusGained(java.awt.event.FocusEvent evt) {//GEN-FIRST:event_formFocusGained
+        inputBox.requestFocusInWindow();
+    }//GEN-LAST:event_formFocusGained
+
     private void doRunCode() {
         String code = inputBox.getText();
         commandsForExport += code + "\n";