diff --git a/Code/Mantid/MantidPlot/src/CurvesDialog.cpp b/Code/Mantid/MantidPlot/src/CurvesDialog.cpp
index a9daac05439b31a00b1e70318258b534f7d1414b..83663a1d5ec26db5201e39558fd1c6d45903daee 100644
--- a/Code/Mantid/MantidPlot/src/CurvesDialog.cpp
+++ b/Code/Mantid/MantidPlot/src/CurvesDialog.cpp
@@ -451,19 +451,24 @@ bool CurvesDialog::addCurve(const QString& name)
   return false;
 }
 
+
+/**Remove curves function
+*
+*/
 void CurvesDialog::removeCurves()
 {
   int count = contents->count();
+  QList<QListWidgetItem *> lst = contents->selectedItems();
+  
   //disables user from deleting last graph from the graph
-  if(count == 1) {
-  QMessageBox::information( 
+  if(count == 1 || count == lst.size()) {
+  QMessageBox::warning( 
     this, 
-    tr("Error - Cannot Delete "), 
+    tr("Cannot Delete"), 
     tr("There should be at least one graph plotted in the graph contents ") );
 	return; 
   }
-
-  QList<QListWidgetItem *> lst = contents->selectedItems();
+  
   for (int i = 0; i < lst.size(); ++i){
     QListWidgetItem *it = lst.at(i);
     QString s = it->text();