diff --git a/addon/components/o-s-s/context-menu.hbs b/addon/components/o-s-s/context-menu.hbs
index e08aeb872..16aea1ad1 100644
--- a/addon/components/o-s-s/context-menu.hbs
+++ b/addon/components/o-s-s/context-menu.hbs
@@ -9,6 +9,7 @@
   @theme={{@theme}}
   @square={{@square}}
   @countDown={{@countDown}}
+  @suffixIcon={{if this.displayContextMenuPanel "fa-chevron-up" "fa-chevron-down"}}
   {{did-insert this.registerMenuTrigger}}
   {{on "click" this.toggleContextMenuPanel}}
   ...attributes
diff --git a/addon/components/o-s-s/context-menu.ts b/addon/components/o-s-s/context-menu.ts
index 3bcc02335..21798516d 100644
--- a/addon/components/o-s-s/context-menu.ts
+++ b/addon/components/o-s-s/context-menu.ts
@@ -8,7 +8,7 @@ export type ContextMenuItem = {
   items?: ContextMenuItem[];
   groupKey?: string;
   rowRenderer?: ReturnType<typeof ensureSafeComponent>;
-  action: () => void | boolean;
+  action: (event?: MouseEvent) => void | boolean;
   [key: string]: unknown;
 };
 
diff --git a/addon/components/o-s-s/context-menu/panel.ts b/addon/components/o-s-s/context-menu/panel.ts
index af29a0728..2773d8070 100644
--- a/addon/components/o-s-s/context-menu/panel.ts
+++ b/addon/components/o-s-s/context-menu/panel.ts
@@ -136,8 +136,8 @@ export default class OSSContextMenuPanelComponent extends Component<OSSContextMe
   }
 
   @action
-  callAction(action: ContextMenuItem['action']): void {
-    const returnValue = action?.();
+  callAction(action: ContextMenuItem['action'], event?: MouseEvent): void {
+    const returnValue = action?.(event);
     if (returnValue !== false) {
       this.args.onClose?.();
     }
diff --git a/tests/integration/components/o-s-s/context-menu-test.ts b/tests/integration/components/o-s-s/context-menu-test.ts
index 1f2032f9c..21c4c6c2c 100644
--- a/tests/integration/components/o-s-s/context-menu-test.ts
+++ b/tests/integration/components/o-s-s/context-menu-test.ts
@@ -54,7 +54,7 @@ module('Integration | Component | o-s-s/context-menu', function (hooks) {
       );
       assert.dom('button i').hasClass('fa-circle-notch').hasClass('fa-spin');
       this.set('loading', false);
-      assert.dom('button i').doesNotExist();
+      assert.dom('button i.fa-circle-notch').doesNotExist();
     });
 
     test('it accepts loadingOptions argument', async function (assert) {
@@ -125,6 +125,25 @@ module('Integration | Component | o-s-s/context-menu', function (hooks) {
   });
 
   module('When clicking on the button', function () {
+    test('it shows chevron-down when panel isclosed', async function (assert) {
+      this.items = [{ title: 'Item', action: () => {} }];
+      await render(
+        hbs`<OSS::ContextMenu @label={{this.label}} @items={{this.items}} data-control-name="context-menu"/>`
+      );
+      assert.dom('button i.fa-chevron-down').exists();
+      assert.dom('button i.fa-chevron-up').doesNotExist();
+    });
+
+    test('it shows chevron-up when panel is open', async function (assert) {
+      this.items = [{ title: 'Item', action: () => {} }];
+      await render(
+        hbs`<OSS::ContextMenu @label={{this.label}} @items={{this.items}} data-control-name="context-menu"/>`
+      );
+      await click('button');
+      assert.dom('button i.fa-chevron-up').exists();
+      assert.dom('button i.fa-chevron-down').doesNotExist();
+    });
+
     test('it opens the panel', async function (assert) {
       await render(hbs`<OSS::ContextMenu @label={{this.label}}
                                          @onMenuOpened={{this.onOpenStub}}