diff --git a/app/src/main/java/com/annimon/hotarufx/ui/FontAwesome.java b/app/src/main/java/com/annimon/hotarufx/ui/FontAwesome.java
index 8a1f722..6daf900 100644
--- a/app/src/main/java/com/annimon/hotarufx/ui/FontAwesome.java
+++ b/app/src/main/java/com/annimon/hotarufx/ui/FontAwesome.java
@@ -16,7 +16,8 @@ public class FontAwesome {
     public static final String
             UNDO = "\uf0e2",
             REDO = "\uf01e",
-            CLIPBOARD = "\uf0ea"
+            CLIPBOARD = "\uf0ea",
+            PLAY = "\uf04b"
             ;
 
     static final Map<String, String> MAPPING;
@@ -25,5 +26,6 @@ public class FontAwesome {
         MAPPING.put("undo", UNDO);
         MAPPING.put("redo", REDO);
         MAPPING.put("clipboard", CLIPBOARD);
+        MAPPING.put("play", PLAY);
     }
 }
diff --git a/app/src/main/java/com/annimon/hotarufx/ui/controller/EditorController.java b/app/src/main/java/com/annimon/hotarufx/ui/controller/EditorController.java
index f3fbec8..d42b14d 100644
--- a/app/src/main/java/com/annimon/hotarufx/ui/controller/EditorController.java
+++ b/app/src/main/java/com/annimon/hotarufx/ui/controller/EditorController.java
@@ -95,7 +95,9 @@ public class EditorController implements Initializable, DocumentListener {
     private void handleMenuPlay(ActionEvent event) {
         log.setText("");
         val input = editor.getText();
-        logError(input);
+        if (input.isEmpty()) {
+            return;
+        }
 
         val context = new Context();
         BundleLoader.load(context, Arrays.asList(
@@ -128,6 +130,7 @@ public class EditorController implements Initializable, DocumentListener {
         initUndoRedo();
         openSample();
         editor.getUndoManager().forgetHistory();
+        Platform.runLater(editor::requestFocus);
     }
 
     private void initUndoRedo() {
diff --git a/app/src/main/resources/fxml/Editor.fxml b/app/src/main/resources/fxml/Editor.fxml
index 42fe0f7..96c87e5 100644
--- a/app/src/main/resources/fxml/Editor.fxml
+++ b/app/src/main/resources/fxml/Editor.fxml
@@ -41,6 +41,12 @@
                         <FontAwesomeIcon icon="redo"/>
                     </graphic>
                 </Button>
+                <Separator/>
+                <Button onAction="#handleMenuPlay">
+                    <graphic>
+                        <FontAwesomeIcon icon="play"/>
+                    </graphic>
+                </Button>
             </ToolBar>
         </VBox>
     </top>