diff --git a/python/gui/auth/qgsauthcertificatemanager.sip b/python/gui/auth/qgsauthcertificatemanager.sip
index 1c2be2d0eda..9b0da79eb24 100644
--- a/python/gui/auth/qgsauthcertificatemanager.sip
+++ b/python/gui/auth/qgsauthcertificatemanager.sip
@@ -27,6 +27,11 @@ class QgsAuthCertEditors : QWidget
  \param parent Parent widget
 %End
 
+    ~QgsAuthCertEditors( );
+%Docstring
+ Destructor: store last selected tab
+%End
+
 };
 
 
diff --git a/src/gui/auth/qgsauthcertificatemanager.cpp b/src/gui/auth/qgsauthcertificatemanager.cpp
index 172df025be9..ffb8652ca9b 100644
--- a/src/gui/auth/qgsauthcertificatemanager.cpp
+++ b/src/gui/auth/qgsauthcertificatemanager.cpp
@@ -15,6 +15,7 @@
  ***************************************************************************/
 
 #include "qgsauthcertificatemanager.h"
+#include "qgssettings.h"
 
 #include <QDialog>
 #include <QDialogButtonBox>
@@ -24,6 +25,14 @@ QgsAuthCertEditors::QgsAuthCertEditors( QWidget *parent )
   : QWidget( parent )
 {
   setupUi( this );
+  QgsSettings settings;
+  tabWidget->setCurrentIndex( settings.value( QStringLiteral( "AuthCertEditorsSelectedTab" ), 0, QgsSettings::Section::Auth ).toInt() );
+}
+
+QgsAuthCertEditors::~QgsAuthCertEditors()
+{
+  QgsSettings settings;
+  settings.setValue( QStringLiteral( "AuthCertEditorsSelectedTab" ), tabWidget->currentIndex(), QgsSettings::Section::Auth );
 }
 
 
diff --git a/src/gui/auth/qgsauthcertificatemanager.h b/src/gui/auth/qgsauthcertificatemanager.h
index 2a04942b204..21fbb15031b 100644
--- a/src/gui/auth/qgsauthcertificatemanager.h
+++ b/src/gui/auth/qgsauthcertificatemanager.h
@@ -40,6 +40,11 @@ class GUI_EXPORT QgsAuthCertEditors : public QWidget, private Ui::QgsAuthCertMan
      */
     explicit QgsAuthCertEditors( QWidget *parent SIP_TRANSFERTHIS = 0 );
 
+    /**
+     * Destructor: store last selected tab
+     */
+    ~QgsAuthCertEditors( );
+
 };