diff --git a/retroshare-gui/src/gui/Identity/IdDialog.cpp b/retroshare-gui/src/gui/Identity/IdDialog.cpp
index 016a8cb27..e8c39e75d 100644
--- a/retroshare-gui/src/gui/Identity/IdDialog.cpp
+++ b/retroshare-gui/src/gui/Identity/IdDialog.cpp
@@ -408,9 +408,7 @@ IdDialog::IdDialog(QWidget *parent)
     connect(ui->autoBanIdentities_CB, SIGNAL(toggled(bool)), this, SLOT(toggleAutoBanIdentities(bool)));
 
 	updateIdTimer.setSingleShot(true);
-	updateCircleTimer.setSingleShot(true);
 	connect(&updateIdTimer, SIGNAL(timeout()), this, SLOT(updateIdList()));
-	connect(&updateCircleTimer, SIGNAL(timeout()), this, SLOT(updateCircles()));
 }
 
 void IdDialog::handleEvent_main_thread(std::shared_ptr<const RsEvent> event)
@@ -429,7 +427,10 @@ void IdDialog::handleEvent_main_thread(std::shared_ptr<const RsEvent> event)
 		case RsGxsIdentityEventCode::UPDATED_IDENTITY:
 			if (isVisible())
 			{
-				updateIdTimer.start(5000);
+                if(rsIdentity->isOwnId(RsGxsId(e->mIdentityId)))
+                    updateIdList();
+                else
+                    updateIdTimer.start(3000);		// use a timer for events not generated by local changes
 			}
 			else
 				needUpdateIdsOnNextShow = true;
@@ -460,9 +461,7 @@ void IdDialog::handleEvent_main_thread(std::shared_ptr<const RsEvent> event)
 		case RsGxsCircleEventCode::CACHE_DATA_UPDATED:
 
 			if (isVisible())
-			{
-				updateCircleTimer.start(5000);
-			}
+                updateCircles();
 			else
 				needUpdateCirclesOnNextShow = true;
 		default:
diff --git a/retroshare-gui/src/gui/Identity/IdDialog.h b/retroshare-gui/src/gui/Identity/IdDialog.h
index 709fd3692..4e465fc5d 100644
--- a/retroshare-gui/src/gui/Identity/IdDialog.h
+++ b/retroshare-gui/src/gui/Identity/IdDialog.h
@@ -154,7 +154,6 @@ private:
 	RsEventsHandlerId_t mEventHandlerId_circles;
 
 	QTimer updateIdTimer;
-	QTimer updateCircleTimer;
 	bool needUpdateIdsOnNextShow;
 	bool needUpdateCirclesOnNextShow;