diff --git a/src/orca/braille.py b/src/orca/braille.py
index f9a8c82..77fb522 100644
--- a/src/orca/braille.py
+++ b/src/orca/braille.py
@@ -585,6 +585,11 @@ class Text(Region):
 
         if not self.contracted and not settings.disableBrailleEOL:
             self.string += self.eol
+        elif settings.disableBrailleEOL:
+            # Ensure there is a place to click on at the end of a line
+            # so the user can route the caret to the end of the line.
+            #
+            self.string += ' '
 
     def __str__(self):
         return "Text: '%s', %d" % (self.string, self.cursorOffset)
diff --git a/src/orca/braille_generator.py b/src/orca/braille_generator.py
index e656db1..6a1e2e0 100644
--- a/src/orca/braille_generator.py
+++ b/src/orca/braille_generator.py
@@ -318,10 +318,11 @@ class BrailleGenerator(generator.Generator):
 
     def _generateEol(self, obj, **args):
         result = []
-        if not args.get('mode', None):
-            args['mode'] = self._mode
-        args['stringType'] = 'eol'
-        result.append(self._script.formatting.getString(**args))
+        if not settings.disableBrailleEOL:
+            if not args.get('mode', None):
+                args['mode'] = self._mode
+            args['stringType'] = 'eol'
+            result.append(self._script.formatting.getString(**args))
         return result
 
     def space(self, delimiter=" "):
diff --git a/src/orca/formatting.py b/src/orca/formatting.py
index 4fa0b45..dc6f54f 100644
--- a/src/orca/formatting.py
+++ b/src/orca/formatting.py
@@ -368,7 +368,7 @@ formatting = {
             # We could then use the cursorOffset field to indicate where the
             # combobox starts.]]]
             #
-            'unfocused': '((comboBoxTextObj and [Text(comboBoxTextObj[0], asString(label))])\
+            'unfocused': '((comboBoxTextObj and [Text(comboBoxTextObj[0], asString(label), asString(eol))])\
                            or [Component(obj, asString(label + displayedText), label and (len(asString(label)) + 1) or 0)])\
                           + [Region(" " + asString(roleName))]'
             },
