Merge from 3.x: PR #3699

Fixes #3141

spyder/widgets/comboboxes.py

@@ -114,9 +114,6 @@ def set_current_text(self, text):
     def add_current_text(self):
         """Add current text to combo box history (convenient method)"""
         text = self.currentText()
-        if osp.isdir(text):
-            if text[-1] == os.sep:
-                text = text[:-1]
         self.add_text(text)
 
     def add_current_text_if_valid(self):
@@ -272,6 +269,17 @@ def selected(self):
         self.valid.emit(True, True)
         self.open_dir.emit(self.selected_text)
 
+    def add_current_text(self):
+        """
+        Add current text to combo box history (convenient method).
+        If path ends in os separator ("\" windows, "/" unix) remove it.
+        """
+        text = self.currentText()
+        if osp.isdir(text) and text:
+            if text[-1] == os.sep:
+                text = text[:-1]
+        self.add_text(text)
+
 
 class UrlComboBox(PathComboBox):
     """