diff --git a/Gui/DataView/GMSHPrefsDialog.cpp b/Gui/DataView/GMSHPrefsDialog.cpp
index e1bfc49d55c3a0ec0f9a6b29c25a4081dbaf5cae..22cc50ed5046a0d3c7dd947f777e5d44a5777b04 100644
--- a/Gui/DataView/GMSHPrefsDialog.cpp
+++ b/Gui/DataView/GMSHPrefsDialog.cpp
@@ -79,7 +79,7 @@ GMSHPrefsDialog::GMSHPrefsDialog(const GeoLib::GEOObjects* geoObjects, QDialog*
 	{
 		this->selectGeoButton->setDisabled(true);
 		this->deselectGeoButton->setDisabled(true);
-		list.append("(No geometry available.)");
+		list.append("[No geometry available.]");
 	}
 	_allGeo->setStringList(list);
 	this->allGeoView->setModel(_allGeo);
@@ -144,8 +144,8 @@ void GMSHPrefsDialog::accept()
 {
 	if (this->_selGeo->stringList().empty())
 	{
-		OGSError::box("No geometry loaded. Geometric data\n is necessary for mesh generation.");
-		this->done(QDialog::Rejected);
+		OGSError::box("No geometry selected. Geometric data\n is necessary for mesh generation.");
+		return;
 	}
 
 	std::vector<std::string> selectedObjects = this->getSelectedObjects(_selGeo->stringList());