diff --git a/ugs-core/src/com/willwinder/universalgcodesender/MacroHelper.java b/ugs-core/src/com/willwinder/universalgcodesender/MacroHelper.java
index c020a4d97..bcc6094fe 100644
--- a/ugs-core/src/com/willwinder/universalgcodesender/MacroHelper.java
+++ b/ugs-core/src/com/willwinder/universalgcodesender/MacroHelper.java
@@ -22,6 +22,7 @@ This file is part of Universal Gcode Sender (UGS).
 import com.willwinder.universalgcodesender.model.BackendAPI;
 import com.willwinder.universalgcodesender.model.Position;
 import com.willwinder.universalgcodesender.services.KeyboardService;
+import com.willwinder.universalgcodesender.uielements.components.RequestFocusListener;
 import net.miginfocom.swing.MigLayout;
 import org.apache.commons.lang3.RegExUtils;
 import org.apache.commons.lang3.StringUtils;
diff --git a/ugs-core/src/com/willwinder/universalgcodesender/RequestFocusListener.java b/ugs-core/src/com/willwinder/universalgcodesender/uielements/components/RequestFocusListener.java
similarity index 80%
rename from ugs-core/src/com/willwinder/universalgcodesender/RequestFocusListener.java
rename to ugs-core/src/com/willwinder/universalgcodesender/uielements/components/RequestFocusListener.java
index 980afcc5c..741b4ba1a 100644
--- a/ugs-core/src/com/willwinder/universalgcodesender/RequestFocusListener.java
+++ b/ugs-core/src/com/willwinder/universalgcodesender/uielements/components/RequestFocusListener.java
@@ -1,4 +1,4 @@
-package com.willwinder.universalgcodesender;
+package com.willwinder.universalgcodesender.uielements.components;
 
 import java.awt.Component;
 import java.awt.Window;
@@ -8,6 +8,11 @@
 import java.awt.event.WindowEvent;
 import javax.swing.SwingUtilities;
 
+/**
+ * Used for focusing a field in an JOptionDialog.
+ * 
+ * Source from: https://tips4java.wordpress.com/2010/03/14/dialog-focus/
+ */
 public class RequestFocusListener implements HierarchyListener {
 
     @Override