diff --git a/Framework/DataHandling/src/LoadAscii2.cpp b/Framework/DataHandling/src/LoadAscii2.cpp
index 6dfb541db3b707f6cff1f39f0476d37bbe7b684e..e53310aa04e5e49fa5ce793cfcff3fd7c3fafe5f 100644
--- a/Framework/DataHandling/src/LoadAscii2.cpp
+++ b/Framework/DataHandling/src/LoadAscii2.cpp
@@ -593,7 +593,7 @@ void LoadAscii2::fillInputValues(std::vector<double> &values,
 //--------------------------------------------------------------------------
 /// Initialisation method.
 void LoadAscii2::init() {
-  const std::vector<std::string> exts{".dat", ".txt", ".csv"};
+  const std::vector<std::string> exts{".dat", ".txt", ".csv", ""};
   declareProperty(Kernel::make_unique<FileProperty>("Filename", "",
                                                     FileProperty::Load, exts),
                   "The name of the text file to read, including its full or "
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadGudrunOutput.py b/Framework/PythonInterface/plugins/algorithms/LoadGudrunOutput.py
index 1d8d81a8b8d650d6646e18f7825ff48997ea0894..a889d974cd24eea84ccbbea6a89f2fee3be8c699 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadGudrunOutput.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadGudrunOutput.py
@@ -1,5 +1,6 @@
 from __future__ import (absolute_import, division, print_function)
-from mantid.api import FileProperty, WorkspaceProperty, PythonAlgorithm, AlgorithmFactory, FileAction
+from mantid.api import (FileProperty, WorkspaceProperty, PythonAlgorithm,
+                        AlgorithmFactory, FileAction, PropertyMode)
 from mantid.kernel import Direction
 from mantid.simpleapi import LoadAscii, CreateWorkspace
 
@@ -25,15 +26,16 @@ class LoadGudrunOutput(PythonAlgorithm):
                                                       ".mdor01",
                                                       ".mgor01"]),
                              doc="Gudrun output file to be loaded.")
-        self.declareProperty(WorkspaceProperty(name='OutputWorkspace', defaultValue='None',
-                                               direction=Direction.Output),
+        self.declareProperty(WorkspaceProperty(name='OutputWorkspace', defaultValue='',
+                                               direction=Direction.Output,
+                                               optional=PropertyMode.Optional),
                              doc="If OutputWorkpsace is None,"
                                  " then the workpsace name will be obtained from the input file.")
 
     def PyExec(self):
         input_file = self.getProperty('InputFile').value
         output_ws = self.getPropertyValue('OutputWorkspace')
-        if output_ws == 'None':
+        if not output_ws:
             output_ws = self.get_title(input_file)
         number_of_columns, data_line_start = self.find_number_of_columns(input_file)
         self.load_gudrun_file(input_file, output_ws, number_of_columns, data_line_start)
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/LoadGudrunOutputTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/LoadGudrunOutputTest.py
index 88c539d95cce5209e0da61b26ff03662cc5e5288..2f3a08e2d1e3c3d707fdb19a26d97bc5c2c1e31c 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/LoadGudrunOutputTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/LoadGudrunOutputTest.py
@@ -66,9 +66,13 @@ class LoadGudrunOutputTest(unittest.TestCase):
             self.assertRaises(ValueError, LoadGudrunOutput, tmp.name, 'out_ws')
 
     def test_rename_with_default_output(self):
-        actual = LoadGudrunOutput(InputFile=self.file_name.format('.dcs'), OutputWorkspace='None')
+        actual = LoadGudrunOutput(InputFile=self.file_name.format('.dcs'), OutputWorkspace='')
         self.assertEqual(actual.name(), 'POLARIS00097947-dcs01')
 
+    def test_name_when_given(self):
+        actual = LoadGudrunOutput(InputFile=self.file_name.format('.dcs'), OutputWorkspace='actual')
+        self.assertEqual(actual.name(), 'actual')
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/qt/widgets/common/src/FileDialogHandler.cpp b/qt/widgets/common/src/FileDialogHandler.cpp
index ac439f52a8c8ccd922cd9226444ea480fc50a3f8..ba9835be2006feeba40d1606efd00a9c40b93ddd 100644
--- a/qt/widgets/common/src/FileDialogHandler.cpp
+++ b/qt/widgets/common/src/FileDialogHandler.cpp
@@ -171,7 +171,7 @@ QString formatExtension(const std::string &extension) {
       formattedExtension.insert(1, ".");
     } else if (extension.at(0) == '.') {
       formattedExtension.prepend("*");
-	} else {
+    } else {
       formattedExtension.prepend("*.");
     }
   }