diff --git a/src/style.css b/src/style.css
index 36b2b01..eb8b60f 100644
--- a/src/style.css
+++ b/src/style.css
@@ -1,7 +1,3 @@
-.message_input_scroll_window > * {
-    box-shadow: none;
-    border-width: 0;
-}
 .message_text_view, .modelfile_textview {
   background-color: rgba(0,0,0,0);
 }
@@ -21,3 +17,7 @@
 .model_list_box > * {
 	margin: 0;
 }
+.user_message:focus, .response_message:focus {
+	box-shadow: 0 0 1px 2px mix(@accent_color, @window_bg_color, 0.5);
+	border-radius: 2px;
+}
diff --git a/src/window.py b/src/window.py
index 06bc794..458e76c 100644
--- a/src/window.py
+++ b/src/window.py
@@ -661,7 +661,7 @@ Generate a title following these rules:
             margin_start=12,
             margin_end=12,
             hexpand=True,
-            css_classes=["flat"],
+            css_classes=["flat"] if bot else ["flat", "user_message"],
         )
         if not bot:
             message_text.update_property([4, 7, 1], [_("User message"), True, msg])
@@ -932,7 +932,7 @@ Generate a title following these rules:
                     margin_top=12,
                     margin_bottom=12,
                     hexpand=True,
-                    css_classes=["flat"]
+                    css_classes=["flat", "response_message"]
                 )
                 message_buffer = message_text.get_buffer()
 
@@ -979,11 +979,11 @@ Generate a title following these rules:
                 buffer.set_style_scheme(source_style)
                 source_view = GtkSource.View(
                     auto_indent=True, indent_width=4, buffer=buffer, show_line_numbers=True,
-                    top_margin=6, bottom_margin=6, left_margin=12, right_margin=12
+                    top_margin=6, bottom_margin=6, left_margin=12, right_margin=12, css_classes=["response_message"]
                 )
                 source_view.update_property([4], [_("{}Code Block").format('{} '.format(language.get_name()) if language else "")])
                 source_view.set_editable(False)
-                code_block_box = Gtk.Box(css_classes=["card"], orientation=1, overflow=1)
+                code_block_box = Gtk.Box(css_classes=["card", "response_message"], orientation=1, overflow=1)
                 title_box = Gtk.Box(margin_start=12, margin_top=3, margin_bottom=3, margin_end=3)
                 title_box.append(Gtk.Label(label=language.get_name() if language else _("Code Block"), hexpand=True, xalign=0))
                 copy_button = Gtk.Button(icon_name="edit-copy-symbolic", css_classes=["flat", "circular"], tooltip_text=_("Copy Message"))