diff --git a/python/gui/editorwidgets/core/qgseditorwidgetfactory.sip b/python/gui/editorwidgets/core/qgseditorwidgetfactory.sip
index dd10d8cd411..194a33f6e5b 100644
--- a/python/gui/editorwidgets/core/qgseditorwidgetfactory.sip
+++ b/python/gui/editorwidgets/core/qgseditorwidgetfactory.sip
@@ -44,7 +44,7 @@ class QgsEditorWidgetFactory
      *
      * @return         A new widget wrapper
      */
-    virtual QgsEditorWidgetWrapper* create( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) const = 0;
+    virtual QgsEditorWidgetWrapper* create( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) const = 0 /Factory/;
 
     /**
      * Return The human readable identifier name of this widget type
@@ -63,7 +63,7 @@ class QgsEditorWidgetFactory
      *
      * @return         A configuration widget
      */
-    virtual QgsEditorConfigWidget* configWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const = 0;
+    virtual QgsEditorConfigWidget* configWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const = 0 /Factory/;
 
     /**
      * Read the config from an XML file and map it to a proper {@link QgsEditorWidgetConfig}.
diff --git a/python/gui/editorwidgets/core/qgseditorwidgetwrapper.sip b/python/gui/editorwidgets/core/qgseditorwidgetwrapper.sip
index 8a0cc6d7fa6..5bf96ab937f 100644
--- a/python/gui/editorwidgets/core/qgseditorwidgetwrapper.sip
+++ b/python/gui/editorwidgets/core/qgseditorwidgetwrapper.sip
@@ -72,7 +72,7 @@ class QgsEditorWidgetWrapper : QObject
     static QgsEditorWidgetWrapper* fromWidget( QWidget* widget );
 
   protected:
-    virtual QWidget* createWidget( QWidget* parent ) = 0 /Factory/;
+    virtual QWidget* createWidget( QWidget* parent ) = 0;
 
     virtual void initWidget( QWidget* editor );
 
diff --git a/src/app/qgsattributetypedialog.cpp b/src/app/qgsattributetypedialog.cpp
index e02c1687663..15e2b0e8bed 100644
--- a/src/app/qgsattributetypedialog.cpp
+++ b/src/app/qgsattributetypedialog.cpp
@@ -77,6 +77,8 @@ QgsAttributeTypeDialog::~QgsAttributeTypeDialog()
 {
   QSettings settings;
   settings.setValue( "/Windows/QgsAttributeTypeDialog/geometry", saveGeometry() );
+
+  qDeleteAll( mEditorConfigWidgets.values() );
 }
 
 const QString QgsAttributeTypeDialog::editorWidgetV2Type()