diff --git a/K7Main.cpp b/K7Main.cpp
index 53ea50e..5072ac2 100644
--- a/K7Main.cpp
+++ b/K7Main.cpp
@@ -260,12 +260,12 @@ void K7Main::DisplayKeys(const vector<GpgME::Key>& kList, const WString& grpLabe
         keyNode->setColumnWidget(1, unique_ptr<WAnchor> (anc));
         WText * lblOwnerTrust = new WText(OwnerTrustLevel[k.ownerTrust()]);
         if (m_config->CanEditOwnerTrust()) {
-            if (!m_keyEdit->IsOurKey(k.primaryFingerprint())) {
-                lblOwnerTrust->doubleClicked().connect(std::bind(&KeyEdit::OnOwnerTrustDoubleClicked, m_keyEdit, keyNode));
-                lblOwnerTrust->setToolTip(TR("TTTDoubleCLick"));
-            } else {
-                lblOwnerTrust->setToolTip(TR("TTTYourKey"));
-            }
+            /*
+             * Here we allow the owner trust level of primary keys to be changed anytime.
+             * Kleopatra doesn't do that for primary keys having ultimate trust level.
+             */
+            lblOwnerTrust->doubleClicked().connect(std::bind(&KeyEdit::OnOwnerTrustDoubleClicked, m_keyEdit, keyNode));
+            lblOwnerTrust->setToolTip(TR("TTTDoubleCLick"));
         }
         keyNode->setColumnWidget(2, unique_ptr<WText> (lblOwnerTrust));
         TreeTableNodeText * ttntFpr = new TreeTableNodeText(k.primaryFingerprint(), keyNode, 3);
diff --git a/KeyEdit.cpp b/KeyEdit.cpp
index 38651d0..57c6d55 100644
--- a/KeyEdit.cpp
+++ b/KeyEdit.cpp
@@ -30,10 +30,10 @@ KeyEdit::~KeyEdit()
 
 void KeyEdit::OnOwnerTrustDoubleClicked(WTreeTableNode * keyNode)
 {
-    // We ought to trust our own keys
-    const WText * lblFpr = static_cast<WText*> (keyNode->columnWidget(3));
-    if (IsOurKey(lblFpr->text()))
-        return;
+    /*
+     * TODO : decide if we should exclude any primary key with ultimate trust
+     * level for any further change.
+     */
     WComboBox * cmbOwnerTrust = new WComboBox();
     FillOwnerTrustCombo(cmbOwnerTrust);
     cmbOwnerTrust->blurred().connect(std::bind(&KeyEdit::OnOwnerTrustBlurred, this, keyNode));