diff --git a/templates/admin/auth/list.tmpl b/templates/admin/auth/list.tmpl
index d989a77cc..cb95cb95d 100644
--- a/templates/admin/auth/list.tmpl
+++ b/templates/admin/auth/list.tmpl
@@ -8,8 +8,8 @@
 				<h4 class="ui top attached header">
 					{{.i18n.Tr "admin.auths.auth_sources"}} ({{.i18n.Tr "admin.total" .Total}})
 				</h4>
-				<div class="ui attached table segment">
-					<table class="ui very basic striped table">
+				<div class="ui unstackable attached table segment">
+					<table class="ui unstackable very basic striped table">
 						<thead>
 							<tr>
 								<th>ID</th>
diff --git a/templates/admin/dashboard.tmpl b/templates/admin/dashboard.tmpl
index 20680bae2..55d9a8917 100644
--- a/templates/admin/dashboard.tmpl
+++ b/templates/admin/dashboard.tmpl
@@ -16,8 +16,8 @@
 				<h4 class="ui top attached header">
 					{{.i18n.Tr "admin.dashboard.operations"}}
 				</h4>
-				<div class="ui attached table segment">
-					<table class="ui very basic table">
+				<div class="ui unstackable attached table segment">
+					<table class="ui unstackable very basic table">
 						<tbody>
 							<tr>
 								<td>{{.i18n.Tr "admin.dashboard.delete_inactivate_accounts"}}</td>
diff --git a/templates/admin/monitor.tmpl b/templates/admin/monitor.tmpl
index fa87078cc..21bb17c2f 100644
--- a/templates/admin/monitor.tmpl
+++ b/templates/admin/monitor.tmpl
@@ -8,8 +8,8 @@
 				<h4 class="ui top attached header">
 					{{.i18n.Tr "admin.monitor.cron"}}
 				</h4>
-				<div class="ui attached table segment">
-					<table class="ui very basic striped table">
+				<div class="ui unstackable attached table segment">
+					<table class="ui unstackable very basic striped table">
 						<thead>
 							<tr>
 								<th>{{.i18n.Tr "admin.monitor.name"}}</th>
@@ -36,8 +36,8 @@
 				<h4 class="ui top attached header">
 					{{.i18n.Tr "admin.monitor.process"}}
 				</h4>
-				<div class="ui attached table segment">
-					<table class="ui very basic striped table">
+				<div class="ui unstackable attached table segment">
+					<table class="ui unstackable very basic striped table">
 						<thead>
 							<tr>
 								<th>Pid</th>
diff --git a/templates/admin/notice.tmpl b/templates/admin/notice.tmpl
index a1c8dc230..fc2c703c0 100644
--- a/templates/admin/notice.tmpl
+++ b/templates/admin/notice.tmpl
@@ -8,8 +8,8 @@
 				<h4 class="ui top attached header">
 					{{.i18n.Tr "admin.notices.system_notice_list"}} ({{.i18n.Tr "admin.total" .Total}})
 				</h4>
-				<div class="ui attached table segment">
-					<table class="ui very basic select selectable table">
+				<div class="ui unstackable attached table segment">
+					<table class="ui unstackable very basic select selectable table">
 						<thead>
 							<tr>
 								<th></th>
diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl
index cde6491a0..a6258a6cb 100644
--- a/templates/admin/org/list.tmpl
+++ b/templates/admin/org/list.tmpl
@@ -11,8 +11,8 @@
 				<div class="ui attached segment">
 					{{template "admin/base/search" .}}
 				</div>
-				<div class="ui attached table segment">
-					<table class="ui very basic striped table">
+				<div class="ui unstackable attached table segment">
+					<table class="ui unstackable very basic striped table">
 						<thead>
 							<tr>
 								<th>ID</th>
diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl
index 293d7093c..e3614bbbe 100644
--- a/templates/admin/repo/list.tmpl
+++ b/templates/admin/repo/list.tmpl
@@ -11,8 +11,8 @@
 				<div class="ui attached segment">
 					{{template "admin/base/search" .}}
 				</div>
-				<div class="ui attached table segment">
-					<table class="ui very basic striped table">
+				<div class="ui unstackable attached table segment">
+					<table class="ui unstackable very basic striped table">
 						<thead>
 							<tr>
 								<th>ID</th>
diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl
index aaf3d9230..077e696a8 100644
--- a/templates/admin/user/list.tmpl
+++ b/templates/admin/user/list.tmpl
@@ -14,8 +14,8 @@
 				<div class="ui attached segment">
 					{{template "admin/base/search" .}}
 				</div>
-				<div class="ui attached table segment">
-					<table class="ui very basic striped table">
+				<div class="ui unstackable attached table segment">
+					<table class="ui unstackable very basic striped table">
 						<thead>
 							<tr>
 								<th>ID</th>
diff --git a/templates/repo/commits_table.tmpl b/templates/repo/commits_table.tmpl
index 0cf823f56..1b835d33c 100644
--- a/templates/repo/commits_table.tmpl
+++ b/templates/repo/commits_table.tmpl
@@ -19,8 +19,8 @@
 </h4>
 
 {{if .Commits}}
-	<div class="ui attached table segment">
-		<table class="ui very basic striped fixed table single line" id="commits-table">
+<div class="ui unstackable attached table segment">
+		<table id="commits-table" class="ui unstackable very basic striped fixed table single line">
 			<thead>
 				<tr>
 					<th class="four wide">{{.i18n.Tr "repo.commits.author"}}</th>
diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl
index 33ce604d0..1ce15a3da 100644
--- a/templates/repo/diff/box.tmpl
+++ b/templates/repo/diff/box.tmpl
@@ -77,7 +77,7 @@
 						</div>
 					{{end}}
 				</h4>
-				<div class="ui attached table segment">
+				<div class="ui unstackable attached table segment">
 					{{if not $file.IsRenamed}}
 						{{$isImage := (call $.IsImageFile $file.Name)}}
 						{{if and $isImage}}
diff --git a/templates/repo/editor/diff_preview.tmpl b/templates/repo/editor/diff_preview.tmpl
index 06b4a2e83..736930110 100644
--- a/templates/repo/editor/diff_preview.tmpl
+++ b/templates/repo/editor/diff_preview.tmpl
@@ -1,5 +1,5 @@
 <div class="diff-file-box">
-	<div class="ui attached table segment">
+	<div class="ui unstackable attached table segment">
 		<div class="file-body file-code code-view code-diff">
 			<table>
 				<tbody>
diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl
index 54dbf13a6..c78ce2d1a 100644
--- a/templates/repo/view_file.tmpl
+++ b/templates/repo/view_file.tmpl
@@ -35,7 +35,7 @@
 			</div>
 		{{end}}
 	</h4>
-	<div class="ui attached table segment">
+	<div class="ui unstackable attached table segment">
 		<div id="{{if .IsIPythonNotebook}}ipython-notebook{{end}}" class="file-view {{if .IsMarkdown}}markdown{{else if .IsIPythonNotebook}}ipython-notebook{{else if .ReadmeInList}}plain-text{{else if and .IsTextFile}}code-view{{end}} has-emoji">
 			{{if .IsMarkdown}}
 				{{if .FileContent}}{{.FileContent | Str2html}}{{end}}
diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl
index 93b9e0df6..d3fe6811f 100644
--- a/templates/repo/view_list.tmpl
+++ b/templates/repo/view_list.tmpl
@@ -1,4 +1,4 @@
-<table id="repo-files-table" class="ui fixed single line table">
+<table id="repo-files-table" class="ui unstackable fixed single line table">
 	<thead>
 		<tr>
 			<th class="four wide">