diff --git a/res/ui/accountConfigurationDialog.ui b/res/ui/accountConfigurationDialog.ui
index f480b5762c3ace1d987e8cca24e0c06bf855b2f7..52d570648a217a869634b483d3486b48cc30a2b6 100644
--- a/res/ui/accountConfigurationDialog.ui
+++ b/res/ui/accountConfigurationDialog.ui
@@ -164,9 +164,9 @@
   </connection>
   <connection>
    <sender>list_communities</sender>
-   <signal>clicked(QModelIndex)</signal>
+   <signal>doubleClicked(QModelIndex)</signal>
    <receiver>AccountConfigurationDialog</receiver>
-   <slot>actionEditCommunity()</slot>
+   <slot>openEditCommunityDialog(QModelIndex)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>199</x>
@@ -183,6 +183,6 @@
   <slot>openAddCommunityDialog()</slot>
   <slot>keyChanged(int)</slot>
   <slot>actionRemoveCommunity()</slot>
-  <slot>actionEditCommunity()</slot>
+  <slot>openEditCommunityDialog(QModelIndex)</slot>
  </slots>
 </ui>
diff --git a/src/cutecoin/gui/configureAccountDialog.py b/src/cutecoin/gui/configureAccountDialog.py
index 98158c490b2ecb3cce950a6bef02440f3b3df0ff..5bdb2633a971d06bf58bbb2efcf6d14aaebabea6 100644
--- a/src/cutecoin/gui/configureAccountDialog.py
+++ b/src/cutecoin/gui/configureAccountDialog.py
@@ -54,7 +54,6 @@ class ConfigureAccountDialog(QDialog, Ui_AccountConfigurationDialog):
 
     def openAddCommunityDialog(self):
         dialog = ConfigureCommunityDialog(None)
-        dialog.setWindowTitle("Add a community")
         dialog.buttonBox.accepted.connect(self.actionAddCommunity)
         dialog.setAccount(self.account)
         dialog.exec_()
@@ -69,8 +68,14 @@ class ConfigureAccountDialog(QDialog, Ui_AccountConfigurationDialog):
         pass
 
     def actionEditCommunity(self):
-        #TODO: Edit selected community
-        pass
+        self.list_communities.setModel(CommunitiesListModel(self.account))
+
+    def openEditCommunityDialog(self, index):
+        community = self.account.communities.communitiesList[index.row()]
+        dialog = ConfigureCommunityDialog(community)
+        dialog.buttonBox.accepted.connect(self.actionEditCommunity)
+        dialog.setAccount(self.account)
+        dialog.exec_()
 
     def keyChanged(self, keyIndex):
         gpg = gnupg.GPG()
diff --git a/src/cutecoin/gui/configureCommunityDialog.py b/src/cutecoin/gui/configureCommunityDialog.py
index bd2208033e6fd997c2ac7a4fa8c2e2e02d725cc1..1ca0b7a8dc805bfaf0f630929707c48e02b6e9d0 100644
--- a/src/cutecoin/gui/configureCommunityDialog.py
+++ b/src/cutecoin/gui/configureCommunityDialog.py
@@ -22,6 +22,11 @@ class ConfigureCommunityDialog(QDialog, Ui_CommunityConfigurationDialog):
         super(ConfigureCommunityDialog, self).__init__()
         self.setupUi(self)
         self.community = community
+        if self.community is None:
+            self.setWindowTitle("Add a community")
+        else:
+            self.setWindowTitle("Configure community " + self.community.currency)
+        self.setData()
 
     def setData(self):
         if self.community is not None: