diff --git a/libgitg/gitg-when-mapped.vala b/libgitg/gitg-when-mapped.vala
index fbb7d693..4142ab2c 100644
--- a/libgitg/gitg-when-mapped.vala
+++ b/libgitg/gitg-when-mapped.vala
@@ -103,6 +103,7 @@ namespace Gitg
 			else
 			{
 				d_sid = d_widget.map.connect(() => {
+					d_widget.disconnect(d_sid);
 					d_sid = 0;
 
 					if (d_lifetime != null)