diff --git a/frontend/src/config.ts b/frontend/src/config.ts
index 01bcee0..5de6c3e 100644
--- a/frontend/src/config.ts
+++ b/frontend/src/config.ts
@@ -1,3 +1,3 @@
 export const API_BASE_URL: string = '/api';
-export const API_FULL_BASE_URL: string = "localhost:8301/api";
+export const API_FULL_BASE_URL: string = `${location.hostname}:8301/api`;
 export const PRODUCT_NAME: string = "FromChat";
\ No newline at end of file
diff --git a/frontend/src/css/_chat.scss b/frontend/src/css/_chat.scss
index 022f4d2..d00197f 100644
--- a/frontend/src/css/_chat.scss
+++ b/frontend/src/css/_chat.scss
@@ -120,6 +120,7 @@
                     margin-bottom: 1rem;
                     max-width: 70%;
                     position: relative;
+                    width: max-content;
 
                     .message-inner {
                         padding: 0.8rem 1rem;