diff --git a/src/launcher.cpp b/src/launcher.cpp
index 1e49711..c0f4fd6 100644
--- a/src/launcher.cpp
+++ b/src/launcher.cpp
@@ -61,7 +61,7 @@ Launcher::Launcher(QQuickView *w)
     m_hideTimer->setSingleShot(true);
     connect(m_hideTimer, &QTimer::timeout, this, [=] { setVisible(false); });
 
-    if (m_dockInterface.isValid()) {
+    if (m_dockInterface.isValid() && !m_dockInterface.lastError().isValid()) {
         updateMargins();
         connect(&m_dockInterface, SIGNAL(primaryGeometryChanged()), this, SLOT(updateMargins()));
         connect(&m_dockInterface, SIGNAL(directionChanged()), this, SLOT(updateMargins()));
diff --git a/src/main.cpp b/src/main.cpp
index 8afbe26..6856ea2 100755
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -20,6 +20,7 @@
 #include <QApplication>
 #include <QDBusConnection>
 #include <QDBusInterface>
+#include <QPixmapCache>
 
 #include "launcher.h"
 #include "launcheritem.h"
@@ -54,6 +55,8 @@ int main(int argc, char *argv[])
     QApplication app(argc, argv);
     app.setApplicationName(QStringLiteral("cutefish-launcher"));
 
+    QPixmapCache::setCacheLimit(1024 * 10);
+
     // QCommandLineParser parser;
     // QCommandLineOption showOption(QStringLiteral("show"), "Show Launcher");
     // parser.addOption(showOption);