diff --git a/README.md b/README.md
index 3c1d57ca6..4984dc34a 100644
--- a/README.md
+++ b/README.md
@@ -74,6 +74,6 @@ FAQ and Changelog
 
 If you are experiencing some sort of problem, please read the FAQ before you open an issue.
 
-FAQ:       https://github.com/nowrep/QupZilla/blob/master/FAQ
+FAQ:       https://github.com/nowrep/QupZilla/wiki/FAQ
 
 Changelog: https://github.com/nowrep/QupZilla/wiki/Changelog
diff --git a/src/app/qupzilla.cpp b/src/app/qupzilla.cpp
index d2bbebb1f..79cfb2db7 100644
--- a/src/app/qupzilla.cpp
+++ b/src/app/qupzilla.cpp
@@ -550,7 +550,7 @@ void QupZilla::loadSettings()
     bool showAddTab = settings.value("showAddTabButton", false).toBool();
     bool makeTransparent = settings.value("useTransparentBackground", false).toBool();
     m_sideBarWidth = settings.value("SideBarWidth", 250).toInt();
-    m_webViewWidth = settings.value("WebViewWidth", 390).toInt();
+    m_webViewWidth = settings.value("WebViewWidth", 2000).toInt();
     QString activeSideBar = settings.value("SideBar", "None").toString();
     settings.endGroup();
     bool adBlockEnabled = settings.value("AdBlock/enabled", true).toBool();
diff --git a/src/popupwindow/popupwindow.cpp b/src/popupwindow/popupwindow.cpp
index 8a5145ee3..a6a9f788e 100644
--- a/src/popupwindow/popupwindow.cpp
+++ b/src/popupwindow/popupwindow.cpp
@@ -65,6 +65,10 @@ PopupWindow::PopupWindow(PopupWebView* view)
     }
 
     m_locationBar->showUrl(urlToShow);
+
+    // Ensuring correct sizes for widgets in layout are calculated even
+    // before calling QWidget::show()
+    m_layout->activate();
 }
 
 void PopupWindow::showNotification(QWidget* notif)
@@ -94,7 +98,12 @@ void PopupWindow::setWindowGeometry(const QRect &newRect)
 {
     if (newRect.isValid()) {
         QRect oldRect = rect();
-        setGeometry(newRect);
+        move(newRect.topLeft());
+
+        QSize newSize = newRect.size();
+        int additionalHeight = height() - m_view->height();
+        newSize.setHeight(newSize.height() + additionalHeight);
+        resize(newSize);
 
         if (newRect.topLeft() == QPoint(0, 0) && oldRect.topLeft() == QPoint(0, 0)) {
             qz_centerWidgetOnScreen(this);