diff --git a/glabels/ObjectEditor.cpp b/glabels/ObjectEditor.cpp
index 90fd532..dece8de 100644
--- a/glabels/ObjectEditor.cpp
+++ b/glabels/ObjectEditor.cpp
@@ -171,6 +171,7 @@ namespace glabels
 
 			connect( mObject, SIGNAL(changed()), this, SLOT(onObjectChanged()) );
 			connect( mObject, SIGNAL(moved()), this, SLOT(onObjectMoved()) );
+			connect( mObject, SIGNAL(destroyed(QObject*)), this, SLOT(onObjectDestroyed()) );
 		}
 		else
 		{
@@ -201,6 +202,13 @@ namespace glabels
 		}
 	}
 
+
+	void ObjectEditor::onObjectDestroyed()
+	{
+		disconnect( mObject, 0, this, 0 );
+		mObject = 0;
+	}
+	
 	
 	void ObjectEditor::onLineControlsChanged()
 	{
diff --git a/glabels/ObjectEditor.h b/glabels/ObjectEditor.h
index 6c5a7ba..3bb66c9 100644
--- a/glabels/ObjectEditor.h
+++ b/glabels/ObjectEditor.h
@@ -69,6 +69,7 @@ namespace glabels
 		void onSelectionChanged();
 		void onObjectChanged();
 		void onObjectMoved();
+		void onObjectDestroyed();
 		void onLineControlsChanged();
 		void onFillControlsChanged();
 		void onPositionControlsChanged();