diff --git a/src/net/java/sip/communicator/plugin/certconfig/CertConfigEntryDialog.java b/src/net/java/sip/communicator/plugin/certconfig/CertConfigEntryDialog.java
index f3ba11472..9b608f20e 100644
--- a/src/net/java/sip/communicator/plugin/certconfig/CertConfigEntryDialog.java
+++ b/src/net/java/sip/communicator/plugin/certconfig/CertConfigEntryDialog.java
@@ -77,7 +77,8 @@ public CertConfigEntryDialog(CertificateConfigEntry e)
                 chkSavePassword.setSelected(entry.isSavePassword());
                 cboKeyStoreTypes.setEnabled(true);
                 cboKeyStoreTypes.setSelectedItem(entry.getKeyStoreType());
-                keyStore = loadKeyStore();
+                if(keyStore == null)
+                    keyStore = loadKeyStore();
                 cboAlias.setEnabled(true);
                 loadAliases();
                 cboAlias.setSelectedItem(entry.getAlias());