diff --git a/apps/mobile/app/components/TeamDropdown/DropDownSection.tsx b/apps/mobile/app/components/TeamDropdown/DropDownSection.tsx
index e6711ae90..cb4e6ed5d 100644
--- a/apps/mobile/app/components/TeamDropdown/DropDownSection.tsx
+++ b/apps/mobile/app/components/TeamDropdown/DropDownSection.tsx
@@ -41,10 +41,18 @@ const DropDownSection: FC<Props> = observer(function DropDownSection({
 
 	const others = teams.filter((t) => t.id !== activeTeamId);
 
-	const { colors } = useAppTheme();
+	const { colors, dark } = useAppTheme();
 	return (
 		<View
-			style={[styles.mainContainer, { backgroundColor: colors.background, shadowColor: 'rgba(0, 0, 0, 0.12)' }]}
+			style={[
+				styles.mainContainer,
+				{
+					backgroundColor: colors.background,
+					shadowColor: 'rgba(0, 0, 0, 0.12)',
+					borderWidth: dark ? 1 : 0,
+					borderColor: colors.border
+				}
+			]}
 		>
 			{/* <View style={styles.indDropDown}>
 				<View style={{ flexDirection: "row", alignItems: "center" }}>
diff --git a/apps/mobile/app/screens/Authenticated/TeamScreen/components/ListCardItem.tsx b/apps/mobile/app/screens/Authenticated/TeamScreen/components/ListCardItem.tsx
index 8e5b3c98c..fbcfb0d65 100644
--- a/apps/mobile/app/screens/Authenticated/TeamScreen/components/ListCardItem.tsx
+++ b/apps/mobile/app/screens/Authenticated/TeamScreen/components/ListCardItem.tsx
@@ -2,7 +2,7 @@
 /* eslint-disable react-native/no-color-literals */
 /* eslint-disable react-native/no-inline-styles */
 import React, { useState } from 'react';
-import { View, ViewStyle, TouchableOpacity, StyleSheet, TouchableWithoutFeedback, Platform } from 'react-native';
+import { View, ViewStyle, TouchableOpacity, StyleSheet, TouchableWithoutFeedback } from 'react-native';
 import { Ionicons, Entypo } from '@expo/vector-icons';
 
 // COMPONENTS
@@ -87,14 +87,7 @@ export const ListItemContent: React.FC<IcontentProps> = observer(({ memberInfo,
 					</View>
 				</View>
 				<View style={[styles.times, { borderTopColor: colors.divider }]}>
-					<TouchableWithoutFeedback
-						onPress={(event) => {
-							if (Platform.OS === 'android' && taskEdition.estimateEditMode) {
-								event.stopPropagation();
-								taskEdition.setEstimateEditMode(false);
-							}
-						}}
-					>
+					<TouchableWithoutFeedback>
 						<View
 							style={{
 								flexDirection: 'row',
@@ -114,7 +107,11 @@ export const ListItemContent: React.FC<IcontentProps> = observer(({ memberInfo,
 							</View>
 
 							{memberInfo.memberTask && taskEdition.estimateEditMode ? (
-								<View style={styles.estimate} ref={clickOutsideTaskEstimationInputRef}>
+								<View
+									style={styles.estimate}
+									collapsable={false}
+									ref={clickOutsideTaskEstimationInputRef}
+								>
 									<EstimateTime
 										setEditEstimate={taskEdition.setEstimateEditMode}
 										currentTask={memberInfo.memberTask}
diff --git a/apps/mobile/app/screens/Authenticated/TimerScreen/components/EstimateTime.tsx b/apps/mobile/app/screens/Authenticated/TimerScreen/components/EstimateTime.tsx
index 69faf6040..bfbb801e1 100644
--- a/apps/mobile/app/screens/Authenticated/TimerScreen/components/EstimateTime.tsx
+++ b/apps/mobile/app/screens/Authenticated/TimerScreen/components/EstimateTime.tsx
@@ -8,16 +8,18 @@ import { secondsToTime } from '../../../../helpers/date';
 import { typography, useAppTheme } from '../../../../theme';
 import { useTeamTasks } from '../../../../services/hooks/features/useTeamTasks';
 import { ITeamTask } from '../../../../services/interfaces/ITask';
+import { useClickOutside } from 'react-native-click-outside';
 
 interface Props {
 	setEditEstimate?: (value: boolean) => unknown;
 	currentTask: ITeamTask;
 	setEstimateTime?: (value: number) => unknown;
+	timerScreen?: boolean;
 }
-const EstimateTime: FC<Props> = ({ setEditEstimate, currentTask, setEstimateTime }) => {
+const EstimateTime: FC<Props> = ({ setEditEstimate, currentTask, setEstimateTime, timerScreen }) => {
 	// Hooks
 	const { updateTask } = useTeamTasks();
-	const { colors } = useAppTheme();
+	const { colors, dark } = useAppTheme();
 
 	// STATES
 	const textInputRef = useRef(null);
@@ -26,6 +28,18 @@ const EstimateTime: FC<Props> = ({ setEditEstimate, currentTask, setEstimateTime
 	const [isLoading, setIsLoading] = useState<boolean>(false);
 	const [showCheckIcon, setShowCheckIcon] = useState<boolean>(false);
 
+	const clickOutsideTaskEstimationInputRef = useClickOutside<View>(() => outsideClickInTimerScreen());
+
+	const outsideClickInTimerScreen = () => {
+		setShowCheckIcon(false);
+		textInputRef?.current?.blur();
+		const { h, m } = secondsToTime(currentTask?.estimate || 0);
+		setEstimate({
+			hours: h.toString(),
+			minutes: m.toString()
+		});
+	};
+
 	useEffect(() => {
 		const { h, m } = secondsToTime(currentTask?.estimate || 0);
 		setEstimate({
@@ -127,7 +141,7 @@ const EstimateTime: FC<Props> = ({ setEditEstimate, currentTask, setEstimateTime
 	};
 
 	return (
-		<View style={[styles.estimate, {}]}>
+		<View style={[styles.estimate, {}]} collapsable={false} ref={timerScreen && clickOutsideTaskEstimationInputRef}>
 			<View>
 				<TextInput
 					ref={textInputRef}
@@ -174,8 +188,22 @@ const EstimateTime: FC<Props> = ({ setEditEstimate, currentTask, setEstimateTime
 				</View>
 			</View>
 			<Text style={[styles.suffix, { color: colors.primary }]}>{' m'}</Text>
-			{showCheckIcon && <Feather size={25} color={'green'} name="check" onPress={() => handleSubmit()} />}
-			{isLoading ? <ActivityIndicator size={14} color="#1B005D" style={styles.loading} /> : null}
+			{showCheckIcon && (
+				<Feather
+					size={25}
+					color={'green'}
+					name="check"
+					onPress={() => handleSubmit()}
+					style={timerScreen ? { position: 'absolute', right: -24 } : undefined}
+				/>
+			)}
+			{isLoading && (
+				<ActivityIndicator
+					size={14}
+					color={timerScreen ? (dark ? colors.primary : '#1B005D') : '#1B005D'}
+					style={timerScreen ? { position: 'absolute', right: -19 } : styles.loading}
+				/>
+			)}
 		</View>
 	);
 };
diff --git a/apps/mobile/app/screens/Authenticated/TimerScreen/components/TimerTaskSection.tsx b/apps/mobile/app/screens/Authenticated/TimerScreen/components/TimerTaskSection.tsx
index a13d39315..b61f29370 100644
--- a/apps/mobile/app/screens/Authenticated/TimerScreen/components/TimerTaskSection.tsx
+++ b/apps/mobile/app/screens/Authenticated/TimerScreen/components/TimerTaskSection.tsx
@@ -160,7 +160,8 @@ const TimerTaskSection = observer(
 									>
 										{translate('myWorkScreen.estimateLabel')} :{' '}
 									</Text>
-									<EstimateTime currentTask={activeTask} />
+
+									<EstimateTime timerScreen={true} currentTask={activeTask} />
 								</View>
 								<TaskSize
 									task={activeTask}
diff --git a/apps/web/app/constants.ts b/apps/web/app/constants.ts
index 6f4e68d77..f36e052a6 100644
--- a/apps/web/app/constants.ts
+++ b/apps/web/app/constants.ts
@@ -2,7 +2,7 @@ import { JitsuOptions } from '@jitsu/jitsu-react/dist/useJitsu';
 import { I_SMTPRequest } from './interfaces/ISmtp';
 
 export const API_BASE_URL = '/api';
-export const DEFAULT_APP_PATH = '/auth/team';
+export const DEFAULT_APP_PATH = '/auth/passcode';
 export const DEFAULT_MAIN_PATH = '/';
 export const PROTECTED_APP_URL_PATHS: RegExp[] = [
 	/^\/$/,
diff --git a/apps/web/pages/auth/passcode.tsx b/apps/web/pages/auth/passcode.tsx
index e249930fa..f4067b730 100644
--- a/apps/web/pages/auth/passcode.tsx
+++ b/apps/web/pages/auth/passcode.tsx
@@ -212,8 +212,11 @@ function WorkSpaceScreen({ form, className }: { form: TAuthenticationPasscode }
 	useEffect(() => {
 		if (form.workspaces.length === 1) {
 			setSelectedWorkspace(0);
-			form.workspaces[0].current_teams.length === 1 &&
-				setSelectedTeam(form.workspaces[0].current_teams[0].team_id);
+		}
+		if (form.workspaces.length === 1 && form.workspaces[0].current_teams.length === 1) {
+			setSelectedTeam(form.workspaces[0].current_teams[0].team_id);
+		}
+		if (form.workspaces.length === 1 && form.workspaces[0].current_teams.length <= 1) {
 			setTimeout(() => {
 				document.getElementById('continue-to-workspace')?.click();
 			}, 100);