diff --git a/Framework/DataHandling/src/LoadAscii.cpp b/Framework/DataHandling/src/LoadAscii.cpp
index 75c33b7860fd88f63bc3e9cc66719b27c82a5f1b..3a3b20e6249136e577c6fe2b76d9686e25925cec 100644
--- a/Framework/DataHandling/src/LoadAscii.cpp
+++ b/Framework/DataHandling/src/LoadAscii.cpp
@@ -300,7 +300,7 @@ void LoadAscii::fillInputValues(std::vector<double> &values,
 //--------------------------------------------------------------------------
 /// Initialisation method.
 void LoadAscii::init() {
-  const std::vector<std::string> extensions{".dat", ".txt", ".csv"};
+  const std::vector<std::string> extensions{".dat", ".txt", ".csv", ""};
   declareProperty(Kernel::make_unique<FileProperty>(
                       "Filename", "", FileProperty::Load, extensions),
                   "The name of the text file to read, including its full or "
diff --git a/Framework/DataHandling/src/LoadNXSPE.cpp b/Framework/DataHandling/src/LoadNXSPE.cpp
index 20a68a82f2e3a7f9022025970e8cc133e40bdd5e..7ffa03c8b64f73010abd3658cc712000040d2764 100644
--- a/Framework/DataHandling/src/LoadNXSPE.cpp
+++ b/Framework/DataHandling/src/LoadNXSPE.cpp
@@ -88,7 +88,7 @@ int LoadNXSPE::confidence(Kernel::NexusDescriptor &descriptor) const {
 /** Initialize the algorithm's properties.
  */
 void LoadNXSPE::init() {
-  const std::vector<std::string> exts{".nxspe"};
+  const std::vector<std::string> exts{".nxspe", ""};
   declareProperty(Kernel::make_unique<FileProperty>("Filename", "",
                                                     FileProperty::Load, exts),
                   "An NXSPE file");
diff --git a/Framework/DataHandling/src/SaveDiffFittingAscii.cpp b/Framework/DataHandling/src/SaveDiffFittingAscii.cpp
index 94d8697fc840f91959d0ceec7e45cb3a9261fd53..d4fd996d230c623e34e46e6c3eb630be930514ea 100644
--- a/Framework/DataHandling/src/SaveDiffFittingAscii.cpp
+++ b/Framework/DataHandling/src/SaveDiffFittingAscii.cpp
@@ -35,7 +35,7 @@ void SaveDiffFittingAscii::init() {
 
   // Declare required parameters, filename with ext {.his} and input
   // workspace
-  const std::vector<std::string> exts{".txt", ".csv"};
+  const std::vector<std::string> exts{".txt", ".csv", ""};
   declareProperty(Kernel::make_unique<API::FileProperty>(
                       "Filename", "", API::FileProperty::Save, exts),
                   "The filename to use for the saved data");
diff --git a/Framework/DataHandling/src/SaveOpenGenieAscii.cpp b/Framework/DataHandling/src/SaveOpenGenieAscii.cpp
index dc35b65be6681ba14979f32f02e6a29f4f9c319d..65114521c0861e5f99d8e9c827d5b353882ba700 100644
--- a/Framework/DataHandling/src/SaveOpenGenieAscii.cpp
+++ b/Framework/DataHandling/src/SaveOpenGenieAscii.cpp
@@ -37,7 +37,7 @@ void SaveOpenGenieAscii::init() {
 
   // Declare required parameters, filename with ext {.his} and input
   // workspace
-  const std::vector<std::string> exts{".his", ".txt"};
+  const std::vector<std::string> exts{".his", ".txt", ""};
   declareProperty(Kernel::make_unique<API::FileProperty>(
                       "Filename", "", API::FileProperty::Save, exts),
                   "The filename to use for the saved data");
diff --git a/qt/widgets/common/src/FileDialogHandler.cpp b/qt/widgets/common/src/FileDialogHandler.cpp
index 2a97322c806b246f2da6099dc6fae8e81f45fa1c..ac439f52a8c8ccd922cd9226444ea480fc50a3f8 100644
--- a/qt/widgets/common/src/FileDialogHandler.cpp
+++ b/qt/widgets/common/src/FileDialogHandler.cpp
@@ -161,7 +161,7 @@ QString getFilter(const std::vector<std::string> &exts) {
  */
 QString formatExtension(const std::string &extension) {
   QString formattedExtension = QString::fromStdString(extension);
-  if (extension == "") {
+  if (extension.empty()) {
     return formattedExtension;
   }
   if (extension.at(0) == '*' && extension.at(1) == '.') {
@@ -171,7 +171,7 @@ QString formatExtension(const std::string &extension) {
       formattedExtension.insert(1, ".");
     } else if (extension.at(0) == '.') {
       formattedExtension.prepend("*");
-    } else {
+	} else {
       formattedExtension.prepend("*.");
     }
   }