diff --git a/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginFragment.kt b/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginFragment.kt
index 7a3ada6fb46f699e38ce03d3e81d5129936040b7..4b048dba683b5acd5f4fbe872565901986948216 100644
--- a/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginFragment.kt
+++ b/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginFragment.kt
@@ -179,7 +179,7 @@ class LoginFragment: Fragment() {
                 binding.viewmodel?.setServerContext()
 
                 if (checkServer()) {
-                    loginAlert(R.string.login_server_check_alert)
+                    whenAuthorizationSucceeds()
                 } else {
                     try {
                         startAuthorization()
@@ -254,6 +254,8 @@ class LoginFragment: Fragment() {
         for (server in serverList) {
             val serverName = LoginRepository(server).loadServerUrl()
             if (serverName == serverHost) {
+                ServerRepository().setServer(server)
+                ServerRepository().changeServerList(server)
                 return true
             }
         }
diff --git a/app/src/main/java/jp/atled/agileworks/widget/AwAppWidgetRemoteViewsFactory.kt b/app/src/main/java/jp/atled/agileworks/widget/AwAppWidgetRemoteViewsFactory.kt
index 7bad2ff6507001b30f004f57a8c75ea6b5d9402d..7044e9882374137cc752870d5eb58ded4257f81d 100644
--- a/app/src/main/java/jp/atled/agileworks/widget/AwAppWidgetRemoteViewsFactory.kt
+++ b/app/src/main/java/jp/atled/agileworks/widget/AwAppWidgetRemoteViewsFactory.kt
@@ -166,9 +166,15 @@ class AwAppWidgetRemoteViewsFactory(applicationContext: Context, intent: Intent?
     private fun getApprovalItems(): List<ApprovalInfo>? {
         try {
             val prefs = AwApp.instance.applicationContext.getSharedPreferences(AwApp.WIDGET_PREFERENCES, Context.MODE_PRIVATE)
+            val timeout = 10000L
+            val startTime = System.currentTimeMillis()
 
             while (prefs.getBoolean(AwApp.WIDGET_UPDATE_FLG, false)) {
                 //別のウィジェットが更新中の場合は待つ
+                if(System.currentTimeMillis() - startTime > timeout){
+                    break
+                }
+                Thread.sleep(100)
             }
 
             prefs.edit().putBoolean(AwApp.WIDGET_UPDATE_FLG, true).apply()