diff --git a/src/components/Widget/HistoryWidget.tsx b/src/components/Widget/HistoryWidget.tsx
index 0df5851..075b105 100644
--- a/src/components/Widget/HistoryWidget.tsx
+++ b/src/components/Widget/HistoryWidget.tsx
@@ -43,7 +43,10 @@ const HistoryWidget = ({ widget }: HistoryWidgetProps) => {
           {messages.reverse().map((message, index) => (
             <>
               <div key={message.id} className="col-span-1 flex flex-col h-full">
-                <MessageNumber number={numMessages - index} glow />
+                <MessageNumber
+                  number={numMessages - index}
+                  glow={index === 0}
+                />
 
                 {/* line below the number */}
                 {numMessages - index !== 1 && (
diff --git a/src/components/Widget/ListWidget.tsx b/src/components/Widget/ListWidget.tsx
index 7c2f2ec..2044e21 100644
--- a/src/components/Widget/ListWidget.tsx
+++ b/src/components/Widget/ListWidget.tsx
@@ -81,7 +81,7 @@ const ListWidget = ({ widget }: ListWidgetProps) => {
       // just pick the first element in the gaze for now
       if (element.id === mouseLeftClick.elemsInGaze[0].id) {
         // @ts-ignore
-        if (!element.messageId) {
+        if (!element.messageId || !element.conversationId) {
           // FIX: all elements should have a message (at least the ones in the list)
           // at the minimu, they should have a conversationId attached to them?
           console.warn('Element does not have a message', element);