diff --git a/docker-compose.yml b/docker-compose.yml
index ad1135ff..884c72fc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   frontend:
-    #build: ./frontend
+    build: ./frontend
     image: ghcr.io/frikky/shuffle-frontend:nightly
     container_name: shuffle-frontend
     hostname: shuffle-frontend
@@ -85,6 +85,8 @@ services:
         hard: 65536
     volumes:
       - ${DB_LOCATION}:/usr/share/opensearch/data:rw
+    ports:
+      - 9200:9200
     networks:
       - shuffle
     restart: unless-stopped
diff --git a/frontend/src/views/AngularWorkflow.jsx b/frontend/src/views/AngularWorkflow.jsx
index af31468c..be7ccd71 100644
--- a/frontend/src/views/AngularWorkflow.jsx
+++ b/frontend/src/views/AngularWorkflow.jsx
@@ -2335,6 +2335,7 @@ const AngularWorkflow = (defaultprops) => {
     	}
 
     	if (data.type === "ACTION") {
+				setSelectedComment({})
 				//var curaction = JSON.parse(JSON.stringify(data))
 				// FIXME: Trust it to just work?
 				//event.target.data()
@@ -2485,6 +2486,7 @@ const AngularWorkflow = (defaultprops) => {
     	    setSelectedActionEnvironment(env);
     	  }
     	} else if (data.type === "TRIGGER") {
+				setSelectedComment({})
 				if (workflow.triggers === null) {
 					workflow.triggers = []
 				}
@@ -2535,7 +2537,6 @@ const AngularWorkflow = (defaultprops) => {
     	}
 
     	setRightSideBarOpen(true);
-			setSelectedComment({})
     	setLastSaved(false);
     	setScrollConfig({
     	  top: 0,
diff --git a/frontend/src/views/LoginPage.jsx b/frontend/src/views/LoginPage.jsx
index 0a40479d..0e6c6b51 100644
--- a/frontend/src/views/LoginPage.jsx
+++ b/frontend/src/views/LoginPage.jsx
@@ -499,13 +499,23 @@ const LoginDialog = (props) => {
   const loadedCheck = isLoaded ? <div>{basedata}</div> : <div></div>;
 
 	useEffect(() => {
-		if (ssoUrl !== undefined && ssoUrl !== null && ssoUrl.length > 0) {
-			//id="sso_button"
-    	const ssoBtn = document.getElementById("sso_button");
-			if (ssoBtn !== undefined && ssoBtn !== null) {
-				console.log("SSO BTN: ", ssoBtn)
+		setTimeout(() => {
+			if (ssoUrl !== undefined && ssoUrl !== null && ssoUrl.length > 0) {
+				//id="sso_button"
+    		const ssoBtn = document.getElementById("sso_button");
+				if (ssoBtn !== undefined && ssoBtn !== null) {
+					console.log("SSO BTN: ", ssoBtn)
+					const cursearch = typeof window === "undefined" || window.location === undefined ? "" : window.location.search;
+					var tmpView = new URLSearchParams(cursearch).get("autologin");
+					if (tmpView !== undefined && tmpView !== null) {
+						if (tmpView === "true") {
+							console.log("Tmp: ", tmpView)
+							ssoBtn.click()
+						}
+					}
+				}
 			}
-		}
+		}, 200);
 	}, [ssoUrl])
 
   return <div>{loadedCheck}</div>;