diff --git a/public/ng/css/gogs.css b/public/ng/css/gogs.css
index 8a0029ac..148df5eb 100644
--- a/public/ng/css/gogs.css
+++ b/public/ng/css/gogs.css
@@ -1155,21 +1155,37 @@ The register and sign-in page style
 #repo-create-cancel {
   margin-left: 4em;
 }
+#dashboard-switch-menu,
 #repo-create-owner-list {
   top: 30px;
   left: 0;
+  width: auto;
+  max-width: 300px;
 }
+#dashboard-switch-menu .octicon,
 #repo-create-owner-list .octicon {
   margin-right: 12px;
   opacity: 0;
 }
+#dashboard-switch-menu .avatar,
 #repo-create-owner-list .avatar {
   width: 20px;
   height: 20px;
 }
+#dashboard-switch-menu li,
+#repo-create-owner-list li {
+  white-space: nowrap;
+}
+#dashboard-switch-menu li.checked .octicon,
 #repo-create-owner-list li.checked .octicon {
   opacity: 1;
 }
+#dashboard-switch-menu li a,
+#repo-create-owner-list li a {
+  text-overflow: ellipsis;
+  -o-text-overflow: ellipsis;
+  overflow: hidden;
+}
 .file-name {
   margin-left: 1em;
 }
diff --git a/public/ng/less/gogs/repository.less b/public/ng/less/gogs/repository.less
index 88d12a7e..13f5a42e 100644
--- a/public/ng/less/gogs/repository.less
+++ b/public/ng/less/gogs/repository.less
@@ -357,22 +357,33 @@
   margin-left: 4em;
 }
 
+#dashboard-switch-menu,
 #repo-create-owner-list {
-  .octicon {
-    margin-right: 12px;
-    opacity: 0;
-  }
-  top: 30px;
-  left: 0;
-  .avatar {
-    width: 20px;
-    height: 20px;
-  }
-  li.checked {
+    top: 30px;
+    left: 0;
+    width: auto;
+    max-width: 300px;
     .octicon {
-      opacity: 1;
+        margin-right: 12px;
+        opacity: 0;
+    }
+    .avatar {
+        width: 20px;
+        height: 20px;
+    }
+    li {
+        white-space: nowrap;
+        &.checked {
+            .octicon {
+                opacity: 1;
+            }
+        }
+        a {
+            text-overflow: ellipsis; 
+            -o-text-overflow: ellipsis; 
+            overflow: hidden;
+        }
     }
-  }
 }
 .file-name {
   margin-left: 1em;