diff --git a/src/plugins/locator/locatorwidget.cpp b/src/plugins/locator/locatorwidget.cpp
index d80a36fb5c4259eb704ef08428839ce41d903293..c23ac96a6aea4e8c68c94c8ab4f556ec6f9b5b8e 100644
--- a/src/plugins/locator/locatorwidget.cpp
+++ b/src/plugins/locator/locatorwidget.cpp
@@ -211,6 +211,12 @@ CompletionList::CompletionList(QWidget *parent)
     // This is too slow when done on all results
     //header()->setResizeMode(QHeaderView::ResizeToContents);
     setWindowFlags(Qt::ToolTip);
+#ifdef Q_WS_MAC
+    if (horizontalScrollBar())
+        horizontalScrollBar()->setAttribute(Qt::WA_MacMiniSize);
+    if (verticalScrollBar())
+        verticalScrollBar()->setAttribute(Qt::WA_MacMiniSize);
+#endif
 }
 
 void CompletionList::updatePreferredSize()
diff --git a/src/plugins/texteditor/completionwidget.cpp b/src/plugins/texteditor/completionwidget.cpp
index 8a22d41b462c452a4f7f798f011c543da72d56e0..a3289ad7eeccf25f5493a0c4ef924957000286cb 100644
--- a/src/plugins/texteditor/completionwidget.cpp
+++ b/src/plugins/texteditor/completionwidget.cpp
@@ -39,6 +39,7 @@
 #include <QtGui/QDesktopWidget>
 #include <QtGui/QKeyEvent>
 #include <QtGui/QVBoxLayout>
+#include <QtGui/QScrollBar>
 
 #include <limits.h>
 
@@ -227,6 +228,12 @@ CompletionListView::CompletionListView(CompletionSupport *support, ITextEditable
     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     setMinimumSize(1, 1);
     setModel(m_model);
+#ifdef Q_WS_MAC
+    if (horizontalScrollBar())
+        horizontalScrollBar()->setAttribute(Qt::WA_MacMiniSize);
+    if (verticalScrollBar())
+        verticalScrollBar()->setAttribute(Qt::WA_MacMiniSize);
+#endif
 }
 
 CompletionListView::~CompletionListView()