diff --git a/SparkleLib/SparkleListener.cs b/SparkleLib/SparkleListener.cs
index 520dfded..9494c59f 100644
--- a/SparkleLib/SparkleListener.cs
+++ b/SparkleLib/SparkleListener.cs
@@ -52,9 +52,9 @@ namespace SparkleLib {
 			Server  = "irc.gnome.org";
 
 			Client = new IrcClient () {
-				PingTimeout          = 90,
-				SocketSendTimeout    = 90,
-				SocketReceiveTimeout = 90,
+				PingTimeout          = 120,
+				SocketSendTimeout    = 120,
+				SocketReceiveTimeout = 120,
 				AutoRetry            = true,
 				AutoReconnect        = true,
 				AutoRejoin           = true
diff --git a/SparkleLib/SparkleRepo.cs b/SparkleLib/SparkleRepo.cs
index 9b567bda..304ab8f8 100644
--- a/SparkleLib/SparkleRepo.cs
+++ b/SparkleLib/SparkleRepo.cs
@@ -332,6 +332,8 @@ namespace SparkleLib {
 
 				SparkleHelpers.DebugInfo ("Irc", "[" + Name + "] Lost connection. Falling back to polling...");
 
+				CheckForRemoteChanges ();
+
 				RemoteTimer.Start ();
 				_IsPolling = true;