diff --git a/Gui/DataView/GeoOnMeshMappingDialog.cpp b/Gui/DataView/GeoOnMeshMappingDialog.cpp
index 382f62dd9a28c80cd48b82d997ee37d525411f2d..f95259f6241f87b94a7ac1760f7fa5ce0f363bde 100644
--- a/Gui/DataView/GeoOnMeshMappingDialog.cpp
+++ b/Gui/DataView/GeoOnMeshMappingDialog.cpp
@@ -33,7 +33,14 @@ GeoOnMeshMappingDialog::~GeoOnMeshMappingDialog()
 void GeoOnMeshMappingDialog::accept()
 {
 	if (this->advancedMappingButton->isEnabled())
+	{
 		_new_geo_name = this->geoNameEdit->text().toStdString();
+		if (_new_geo_name.empty())
+		{
+			OGSError::box("Please enter name for new geometry.");
+			return;
+		}
+	}
 	this->done(QDialog::Accepted);
 }