diff --git a/Mapper.cpp b/Mapper.cpp
index 42f85df..f3a19ce 100644
--- a/Mapper.cpp
+++ b/Mapper.cpp
@@ -52,6 +52,11 @@ Mapper::Mapper(Mapping::ptr mapping)
   qDebug() << "Creating mapper" << endl;
 }
 
+Mapper::~Mapper()
+{
+  delete _propertyBrowser;
+}
+
 QWidget* Mapper::getPropertiesEditor()
 {
   return _propertyBrowser;
diff --git a/Mapper.h b/Mapper.h
index b593809..a0c6c79 100644
--- a/Mapper.h
+++ b/Mapper.h
@@ -68,7 +68,7 @@ public:
   typedef std::tr1::shared_ptr<Mapper> ptr;
 
   Mapper(Mapping::ptr mapping);
-  virtual ~Mapper() {}
+  virtual ~Mapper();
 
   virtual QWidget* getPropertiesEditor();
   virtual void draw(QPainter* painter) = 0;