diff --git a/src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp b/src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp
index ac5bf3ed249..1b2f14883b0 100644
--- a/src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp
+++ b/src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp
@@ -20,14 +20,10 @@
 #include "qgsvectorlayer.h"
 #include "qgsmessagelog.h"
 
-
-QgsEditorWidgetRegistry *QgsEditorWidgetRegistry::sInstance = 0;
-
 QgsEditorWidgetRegistry* QgsEditorWidgetRegistry::instance()
 {
-  if ( !sInstance )
-    sInstance = new QgsEditorWidgetRegistry();
-  return sInstance;
+  static QgsEditorWidgetRegistry sInstance;
+  return &sInstance;
 }
 
 QgsEditorWidgetRegistry::QgsEditorWidgetRegistry()
diff --git a/src/gui/editorwidgets/core/qgseditorwidgetregistry.h b/src/gui/editorwidgets/core/qgseditorwidgetregistry.h
index b1a5bf5ab48..1e7e0933e69 100644
--- a/src/gui/editorwidgets/core/qgseditorwidgetregistry.h
+++ b/src/gui/editorwidgets/core/qgseditorwidgetregistry.h
@@ -112,7 +112,6 @@ class GUI_EXPORT QgsEditorWidgetRegistry : public QObject
 
   private:
     QMap<QString, QgsEditorWidgetFactory*> mWidgetFactories;
-    static QgsEditorWidgetRegistry *sInstance;
 };