--- a/client/swing/src/main/java/com/redhat/thermostat/client/swing/internal/views/ClientConfigurationSwing.java	Mon Nov 18 16:05:37 2013 -0500
+++ b/client/swing/src/main/java/com/redhat/thermostat/client/swing/internal/views/ClientConfigurationSwing.java	Mon Nov 18 17:47:25 2013 -0500
@@ -47,6 +47,7 @@
 
 import javax.swing.JDialog;
 import javax.swing.JOptionPane;
+import javax.swing.JTextField;
 import javax.swing.SwingUtilities;
 import javax.swing.WindowConstants;
 
@@ -74,6 +75,23 @@
 
         windowClosingListener = new WindowClosingListener();
         configurationPanel = new ClientConfigurationPanel();
+
+        java.awt.event.ActionListener acceptOnEnterListener = new java.awt.event.ActionListener() {
+            @Override
+            public void actionPerformed(java.awt.event.ActionEvent arg0) {
+                fireAction(new ActionEvent<>(ClientConfigurationSwing.this, Action.CLOSE_ACCEPT));
+            }
+        };
+
+        // handle 'enter' in text fields
+        JTextField[] fields = new JTextField[] {
+                configurationPanel.storageUrl,
+                configurationPanel.userName,
+                configurationPanel.password};
+
+        for (JTextField field: fields) {
+            field.addActionListener(acceptOnEnterListener);
+        }
         
         final JOptionPane optionPane = new JOptionPane(configurationPanel);
         optionPane.setOptionType(JOptionPane.OK_CANCEL_OPTION);

--- a/client/swing/src/test/java/com/redhat/thermostat/client/swing/internal/views/ClientConfigurationSwingTest.java	Mon Nov 18 16:05:37 2013 -0500
+++ b/client/swing/src/test/java/com/redhat/thermostat/client/swing/internal/views/ClientConfigurationSwingTest.java	Mon Nov 18 17:47:25 2013 -0500
@@ -119,6 +119,17 @@
         assertEquals("foobar", frame.getConnectionUrl());
     }
 
+
+    @Category(GUITest.class)
+    @GUITest
+    @Test
+    public void testEnterInConnectionUrlTextAcceptsPrompt() {
+        JTextComponentFixture textBox = frameFixture.textBox("connectionUrl");
+        textBox.enterText("foobar\n");
+
+        verify(l).actionPerformed(new ActionEvent<>(frame, ClientConfigurationView.Action.CLOSE_ACCEPT));
+    }
+
     @Category(GUITest.class)
     @Test
     public void testPasswordText() {
@@ -129,6 +140,17 @@
         assertEquals("foobar", frame.getPassword());
     }
     
+
+    @Category(GUITest.class)
+    @GUITest
+    @Test
+    public void testEnterInPasswordTextAcceptsPrompt() {
+        JTextComponentFixture textBox = frameFixture.textBox("password");
+        textBox.enterText("foobar\n");
+
+        verify(l).actionPerformed(new ActionEvent<>(frame, ClientConfigurationView.Action.CLOSE_ACCEPT));
+    }
+
     @Category(GUITest.class)
     @Test
     public void testUsernameText() {
@@ -139,6 +161,17 @@
         assertEquals("foobar", frame.getUserName());
     }
     
+
+    @Category(GUITest.class)
+    @GUITest
+    @Test
+    public void testEnterInUsernameTextAcceptsPrompt() {
+        JTextComponentFixture textBox = frameFixture.textBox("username");
+        textBox.enterText("foobar\n");
+
+        verify(l).actionPerformed(new ActionEvent<>(frame, ClientConfigurationView.Action.CLOSE_ACCEPT));
+    }
+
     @Category(GUITest.class)
     @Test
     public void testSaveEntitlements() {