diff --git a/conntrackt/templates/conntrackt/entity_detail.html b/conntrackt/templates/conntrackt/entity_detail.html
--- a/conntrackt/templates/conntrackt/entity_detail.html
+++ b/conntrackt/templates/conntrackt/entity_detail.html
@@ -89,7 +89,8 @@
       {% endif %}
       <div>
         {% with entity_id=entity.id|slugify %}
-        {% html_link "Add communication" "communication_create" class="btn btn-primary btn-mini" get="to_entity="|add:entity_id %}
+        {% url "entity" entity.id as next %}
+        {% html_link "Add communication" "communication_create" class="btn btn-primary btn-mini" get="to_entity="|add:entity_id|add:"&next="|add:next %}
         {% endwith %}
       </div>
     </div>
@@ -113,7 +114,8 @@
       {% endif %}
       <div>
         {% with entity_id=entity.id|slugify %}
-        {% html_link "Add communication" "communication_create" class="btn btn-primary btn-mini" get="from_entity="|add:entity_id %}
+        {% url "entity" entity.id as next %}
+        {% html_link "Add communication" "communication_create" class="btn btn-primary btn-mini" get="from_entity="|add:entity_id|add:"&next="|add:next %}
         {% endwith %}
       </div>
     </div>