diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
index ab42fde3e8d6..ffdd2c2b35ac 100644
--- a/src/app/composer/qgscomposer.cpp
+++ b/src/app/composer/qgscomposer.cpp
@@ -673,6 +673,7 @@ QgsComposer::QgsComposer( QgsComposition *composition )
 
 QgsComposer::~QgsComposer()
 {
+  mComposition->setAllDeselected();
   delete mPrinter;
 }
 
diff --git a/src/core/composer/qgscomposermousehandles.h b/src/core/composer/qgscomposermousehandles.h
index 2e6cd824cf9d..36a41bce8001 100644
--- a/src/core/composer/qgscomposermousehandles.h
+++ b/src/core/composer/qgscomposermousehandles.h
@@ -19,6 +19,7 @@
 
 #include <QGraphicsRectItem>
 #include <QObject>
+#include <QPointer>
 
 #include "qgis_core.h"
 
@@ -110,7 +111,7 @@ class CORE_EXPORT QgsComposerMouseHandles: public QObject, public QGraphicsRectI
   private:
 
     QgsComposition *mComposition; //reference to composition
-    QGraphicsView *mGraphicsView; //reference to QGraphicsView
+    QPointer< QGraphicsView > mGraphicsView; //reference to QGraphicsView
 
     QgsComposerMouseHandles::MouseAction mCurrentMouseMoveAction;
     //! Start point of the last mouse move action (in scene coordinates)