diff --git a/src/mainview/components/AccountComboBox.qml b/src/mainview/components/AccountComboBox.qml
index a826559e3280706ad282925711bb1be3ffddc16a..b3e1c7f1859145e3f6769d18fa818774a2254224 100644
--- a/src/mainview/components/AccountComboBox.qml
+++ b/src/mainview/components/AccountComboBox.qml
@@ -199,6 +199,17 @@ ComboBox {
         implicitWidth: root.width
         implicitHeight: root.height
         color: JamiTheme.backgroundColor
+
+        // TODO: this can be removed when frameless window is implemented
+        Rectangle {
+            height: 1
+            anchors {
+                top: parent.top
+                left: parent.left
+                right: parent.right
+            }
+            color: JamiTheme.tabbarBorderColor
+        }
     }
 
     MouseArea {
diff --git a/src/mainview/components/AccountComboBoxPopup.qml b/src/mainview/components/AccountComboBoxPopup.qml
index a76055d3a8a886e48acd30616c90416a45270b0e..441436d85a64124c0ef48d3b446901ef083ae79d 100644
--- a/src/mainview/components/AccountComboBoxPopup.qml
+++ b/src/mainview/components/AccountComboBoxPopup.qml
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (C) 2020 by Savoir-faire Linux
  * Author: Mingrui Zhang <mingrui.zhang@savoirfairelinux.com>
@@ -16,26 +15,27 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
+
 import QtQuick 2.14
 import QtQuick.Controls 2.14
 import QtQuick.Layouts 1.14
+import QtGraphicalEffects 1.15
 import net.jami.Models 1.0
 import net.jami.Adapters 1.0
 
 import "../../commoncomponents"
 
 Popup {
-    id: comboBoxPopup
+    id: root
 
     property bool toogleUpdatePopupHeight: false
 
     y: accountComboBox.height - 1
     implicitWidth: accountComboBox.width - 1
 
-
     // Hack - limite the accounts that can be shown.
     implicitHeight: {
-        comboBoxPopup.visible
+        root.visible
         return Math.min(accountComboBox.height *
                         Math.min(5, accountListModel.rowCount() + 1),
                         mainViewSidePanelRect.height)
@@ -140,7 +140,7 @@ Popup {
                 onReleased: {
                     itemCoboBackground.color = JamiTheme.releaseColor
                     currentIndex = index
-                    comboBoxPopup.close()
+                    root.close()
                     AccountAdapter.accountChanged(index)
                 }
                 onEntered: {
@@ -166,23 +166,36 @@ Popup {
             font.pointSize: JamiTheme.textFontSize
 
             onClicked: {
-                comboBoxPopup.close()
+                root.close()
                 mainViewWindow.startWizard()
             }
         }
 
         ScrollIndicator.vertical: ScrollIndicator {}
     }
+
     background: Rectangle {
         id: accountComboBoxPopup
+
         color: JamiTheme.backgroundColor
         CustomBorder {
             commonBorder: false
-            lBorderwidth: 1
+            lBorderwidth: 2
             rBorderwidth: 1
             tBorderwidth: 1
-            bBorderwidth: 1
+            bBorderwidth: 2
             borderColor: JamiTheme.tabbarBorderColor
         }
+
+        layer {
+            enabled: true
+            effect: DropShadow {
+                color: "#80000000"
+                verticalOffset: 2
+                horizontalOffset: 2
+                samples: 16
+                radius: 10
+            }
+        }
     }
 }