--- a/src/hbinput/inputwidgets/hbinputsettinglist.cpp	Fri Sep 17 08:32:10 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputsettinglist.cpp	Mon Oct 04 00:38:12 2010 +0300
@@ -39,7 +39,14 @@
 #include <hbinputregioncollector_p.h>
 #include <hbinputmethodselectionlist.h>
 
-#include "hbdialog_p.h"
+#include "hbinputpopupbase_p.h"
+
+/*!
+@stable
+@hbinput
+\class HbInputSettingList
+\brief Input options popup opened from virtual keyboards.
+*/
 
 const QString settingsIcon("qtg_mono_settings");
 const QString inputMethodIcon("qtg_mono_virtual_input");
@@ -49,7 +56,7 @@
 
 /// @cond
 
-class HbInputSettingListPrivate : public HbDialogPrivate
+class HbInputSettingListPrivate : public HbInputPopupBasePrivate
 {
     Q_DECLARE_PUBLIC(HbInputSettingList)
 
@@ -128,7 +135,7 @@
 Constructs input setting list
 */
 HbInputSettingList::HbInputSettingList(QGraphicsWidget *parent)
-    : HbDialog(*new HbInputSettingListPrivate(), parent)
+    : HbInputPopupBase(*new HbInputSettingListPrivate(), parent)
 {
     Q_D(HbInputSettingList);
     HbInputRegionCollector::instance()->attach(this);
@@ -191,11 +198,6 @@
     setContentsMargins(margin, margin, margin, margin);
     setPreferredWidth(listWidth);
 
-    // Make sure the input settings list never steals focus.
-    setFlag(QGraphicsItem::ItemIsPanel, true);
-    d->mActivePopup = false;
-    setActive(false);
-
     connect(d->mLanguageButton, SIGNAL(clicked(bool)), this, SLOT(languageButtonClicked()));
     connect(d->mPredictionButton, SIGNAL(clicked(bool)), this, SLOT(predictionButtonClicked()));
     connect(d->mOptionList, SIGNAL(activated(HbListWidgetItem *)), this, SLOT(listItemActivated(HbListWidgetItem *)));