diff --git a/Code/Mantid/QtPropertyBrowser/src/ParameterPropertyManager.cpp b/Code/Mantid/QtPropertyBrowser/src/ParameterPropertyManager.cpp
index 7b0929822ba5..a1db9506baba 100644
--- a/Code/Mantid/QtPropertyBrowser/src/ParameterPropertyManager.cpp
+++ b/Code/Mantid/QtPropertyBrowser/src/ParameterPropertyManager.cpp
@@ -5,6 +5,8 @@
 #include <stdexcept>
 #include <math.h>
 
+const QString ParameterPropertyManager::ERROR_TOOLTIP(" (Error)");
+
 ParameterPropertyManager::ParameterPropertyManager(QObject *parent)
   : QtDoublePropertyManager(parent),
     m_errors(), m_errorsEnabled(false)
@@ -61,7 +63,7 @@ void ParameterPropertyManager::setError(QtProperty* property, const double& erro
 {
   m_errors[property] = error;
   emit propertyChanged(property);
-  // TODO: update tooltip
+  updateTooltip(property);
 }
 
 /**
@@ -82,7 +84,7 @@ void ParameterPropertyManager::clearError(QtProperty* property)
 {
   m_errors.remove(property);
   emit propertyChanged(property);
-  // TODO: update tooltip
+  updateTooltip(property);
 }
 
 /**
@@ -96,7 +98,7 @@ void ParameterPropertyManager::setErrorsEnabled(bool enabled)
   foreach(QtProperty* prop, m_errors.keys())
   {
     emit propertyChanged(prop);
-    // TODO: update tooltip
+    updateTooltip(prop);
   }
 }
 
@@ -133,6 +135,14 @@ QString ParameterPropertyManager::valueText(const QtProperty* property) const
  */
 void ParameterPropertyManager::updateTooltip(QtProperty* property) const
 {
-  property->setToolTip(QString::fromStdString(description(property)));
-  // TODO: append description for error if enabled and set
+  // Description only initially
+  QString tooltip = QString::fromStdString(description(property));
+
+  if ( areErrorsEnabled() && isErrorSet(property))
+  {
+    // If error is displayed - add description for it
+    tooltip += ERROR_TOOLTIP;
+  }
+
+  property->setToolTip(tooltip);
 }
diff --git a/Code/Mantid/QtPropertyBrowser/src/ParameterPropertyManager.h b/Code/Mantid/QtPropertyBrowser/src/ParameterPropertyManager.h
index 3caee4aa688c..3bca0b6837e3 100644
--- a/Code/Mantid/QtPropertyBrowser/src/ParameterPropertyManager.h
+++ b/Code/Mantid/QtPropertyBrowser/src/ParameterPropertyManager.h
@@ -70,6 +70,9 @@ private Q_SLOTS:
   void updateTooltip(QtProperty* property) const;
 
 private:
+  /// Text appended to parameter descr. tooltip if error is set
+  static const QString ERROR_TOOLTIP;
+
   /// Parameter error values
   QMap<QtProperty*, double> m_errors;