diff --git a/src/lib/app/mainmenu.cpp b/src/lib/app/mainmenu.cpp
index 18cce35fd..50012918a 100644
--- a/src/lib/app/mainmenu.cpp
+++ b/src/lib/app/mainmenu.cpp
@@ -309,7 +309,7 @@ void MainMenu::showDownloadManager()
 
 void MainMenu::showCookieManager()
 {
-    CookieManager* m = new CookieManager();
+    CookieManager* m = new CookieManager(m_window);
     m->show();
     m->raise();
 }
diff --git a/src/lib/cookies/cookiemanager.cpp b/src/lib/cookies/cookiemanager.cpp
index f767971b7..a6fba010f 100644
--- a/src/lib/cookies/cookiemanager.cpp
+++ b/src/lib/cookies/cookiemanager.cpp
@@ -1,6 +1,6 @@
 /* ============================================================
 * Falkon - Qt web browser
-* Copyright (C) 2010-2017 David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2018 David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -32,8 +32,8 @@
 #include <QInputDialog>
 #include <QCloseEvent>
 
-CookieManager::CookieManager()
-    : QWidget()
+CookieManager::CookieManager(QWidget *parent)
+    : QDialog(parent)
     , ui(new Ui::CookieManager)
 {
     setAttribute(Qt::WA_DeleteOnClose);
diff --git a/src/lib/cookies/cookiemanager.h b/src/lib/cookies/cookiemanager.h
index f58f62c56..914fe2e21 100644
--- a/src/lib/cookies/cookiemanager.h
+++ b/src/lib/cookies/cookiemanager.h
@@ -1,6 +1,6 @@
 /* ============================================================
 * Falkon - Qt web browser
-* Copyright (C) 2010-2014  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2018 David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 #ifndef COOKIEMANAGER_H
 #define COOKIEMANAGER_H
 
-#include <QWidget>
+#include <QDialog>
 
 #include "qzcommon.h"
 
@@ -32,12 +32,12 @@ class QNetworkCookie;
 
 class BrowserWindow;
 
-class FALKON_EXPORT CookieManager : public QWidget
+class FALKON_EXPORT CookieManager : public QDialog
 {
     Q_OBJECT
 
 public:
-    explicit CookieManager();
+    explicit CookieManager(QWidget *parent = nullptr);
     ~CookieManager();
 
 private slots:
diff --git a/src/lib/cookies/cookiemanager.ui b/src/lib/cookies/cookiemanager.ui
index d6fad92c5..01cb72cba 100644
--- a/src/lib/cookies/cookiemanager.ui
+++ b/src/lib/cookies/cookiemanager.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>CookieManager</class>
- <widget class="QWidget" name="CookieManager">
+ <widget class="QDialog" name="CookieManager">
   <property name="geometry">
    <rect>
     <x>0</x>
diff --git a/src/lib/other/clearprivatedata.cpp b/src/lib/other/clearprivatedata.cpp
index 00f5ab614..ce84be5bc 100644
--- a/src/lib/other/clearprivatedata.cpp
+++ b/src/lib/other/clearprivatedata.cpp
@@ -1,6 +1,6 @@
 /* ============================================================
 * Falkon - Qt web browser
-* Copyright (C) 2010-2017 David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2018 David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -174,7 +174,7 @@ void ClearPrivateData::optimizeDb()
 
 void ClearPrivateData::showCookieManager()
 {
-    CookieManager* dialog = new CookieManager();
+    CookieManager* dialog = new CookieManager(this);
     dialog->show();
 }
 
diff --git a/src/lib/preferences/preferences.cpp b/src/lib/preferences/preferences.cpp
index 5902aafd3..ef8d13f26 100644
--- a/src/lib/preferences/preferences.cpp
+++ b/src/lib/preferences/preferences.cpp
@@ -709,7 +709,7 @@ void Preferences::allowHtml5storageChanged(bool stat)
 
 void Preferences::showCookieManager()
 {
-    CookieManager* dialog = new CookieManager();
+    CookieManager* dialog = new CookieManager(this);
     dialog->show();
 }