diff --git a/ChangeLog b/ChangeLog
index 47bb36838..700b1a994 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
 Version 0.0.2:
+    * Don't let long playlist or summary names force a large Tomahawk window.
 	* Fixed Jabber auth: Freshly added contacts never showed up.
+
 Version 0.0.1:
 	* First public release.
diff --git a/src/sip/twitter/twitter.cpp b/src/sip/twitter/twitter.cpp
index 50541b367..ba8b3f1ef 100644
--- a/src/sip/twitter/twitter.cpp
+++ b/src/sip/twitter/twitter.cpp
@@ -168,6 +168,7 @@ TwitterPlugin::disconnectPlugin()
         m_twitterAuth.data()->deleteLater();
     
     m_cachedPeers.empty();
+    m_attemptedConnects.empty();
     delete m_twitterAuth.data();
     m_isOnline = false;
 }
@@ -583,14 +584,16 @@ TwitterPlugin::registerOffer( const QString &screenName, const QHash< QString, Q
             qDebug() << "TwitterPlugin did not send offer because external address is " << Servent::instance()->externalAddress() << " and external port is " << Servent::instance()->externalPort();
     }
 
-    if ( m_isOnline && _peerData.contains( "host" ) && _peerData.contains( "port" ) && _peerData.contains( "pkey" ) )
-        QMetaObject::invokeMethod( this, "makeConnection", Q_ARG( QString, screenName ), QGenericArgument( "QHash< QString, QVariant >", (const void*)&_peerData ) );
-    
     if ( peersChanged )
     {
         m_cachedPeers[screenName] = QVariant::fromValue< QHash< QString, QVariant > >( _peerData );
         TomahawkSettings::instance()->setTwitterCachedPeers( m_cachedPeers );
+        m_attemptedConnects[screenName] = false;
     }
+
+    if ( m_isOnline && _peerData.contains( "host" ) && _peerData.contains( "port" ) && _peerData.contains( "pkey" ) )
+        QMetaObject::invokeMethod( this, "makeConnection", Q_ARG( QString, screenName ), QGenericArgument( "QHash< QString, QVariant >", (const void*)&_peerData ) );
+    
 }
 
 void
@@ -611,6 +614,11 @@ void
 TwitterPlugin::makeConnection( const QString &screenName, const QHash< QString, QVariant > &peerData )
 {
     qDebug() << Q_FUNC_INFO;
+    if ( m_attemptedConnects.contains( screenName ) && m_attemptedConnects[screenName] )
+    {
+        qDebug() << "Already attempted to connect to this peer with no change in their status, not trying again for now";
+        return;
+    }
     if ( !peerData.contains( "host" ) || !peerData.contains( "port" ) || !peerData.contains( "pkey" ) || !peerData.contains( "node" ) )
     {
         qDebug() << "TwitterPlugin could not find host and/or port and/or pkey for peer " << screenName;
@@ -623,6 +631,7 @@ TwitterPlugin::makeConnection( const QString &screenName, const QHash< QString,
                                             peerData["pkey"].toString(),
                                             friendlyName,
                                             peerData["node"].toString() );
+    m_attemptedConnects[screenName] = true;
 }
 
 void
diff --git a/src/sip/twitter/twitter.h b/src/sip/twitter/twitter.h
index 839ec88c3..b0dc213b3 100644
--- a/src/sip/twitter/twitter.h
+++ b/src/sip/twitter/twitter.h
@@ -108,6 +108,7 @@ private:
     qint64 m_cachedMentionsSinceId;
     qint64 m_cachedDirectMessagesSinceId;
     QHash< QString, QVariant > m_cachedPeers;
+    QHash< QString, bool > m_attemptedConnects;
     QSet<QString> m_keyCache;
     bool m_finishedFriends;
     bool m_finishedMentions;