diff --git a/shared/css/static/modal-bookmarks.scss b/shared/css/static/modal-bookmarks.scss
index 7b3679cb..69186daa 100644
--- a/shared/css/static/modal-bookmarks.scss
+++ b/shared/css/static/modal-bookmarks.scss
@@ -7,6 +7,7 @@
 	.bookmark-list {
 		flex-grow: 1;
 		flex-shrink: 1;
+		min-height: 75px;
 
 		display: flex;
 		flex-direction: column;
@@ -56,17 +57,55 @@
 		flex-grow: 0;
 		flex-shrink: 0;
 
+		display: flex;
+		justify-content: space-between;
+		flex-direction: row;
+
 		margin-top: 5px;
 		text-align: right;
 
 		button {
 			margin-left: 5px;
 		}
+
+
+		.button-large {
+			display: block;
+		}
+
+		.button-small {
+			display: none;
+		}
 	}
 
-	.group_box:not(:first-of-type) {
-		flex-grow: 0;
-		flex-shrink: 0;
+	@media (max-width: 1000px) {
+		.buttons {
+			.button-large {
+				display: none;
+			}
+
+			.button-small {
+				display: block;
+			}
+		}
+	}
+
+	.group_box {
+		flex-shrink: 1;
+
+		.header {
+			flex-grow: 0;
+			flex-shrink: 0;
+		}
+
+
+		&.gb-settings {
+			overflow-y: auto;
+		}
+
+		&.gb-list {
+			min-height: 100px; /* 25px header + 75px body */
+		}
 	}
 
 	.bookmark-setting {
diff --git a/shared/html/templates.html b/shared/html/templates.html
index 5e202983..9263f51a 100644
--- a/shared/html/templates.html
+++ b/shared/html/templates.html
@@ -2880,7 +2880,7 @@
 
         <script class="jsrender-template" id="tmpl_manage_bookmarks" type="text/html">
             <div class="modal-bookmarks">
-                <div class="group_box">
+                <div class="group_box gb-list">
                     <div class="header">{{tr "Bookmarks" /}}</div>
                     <div class="content bookmark-list">
                         <div class="list">
@@ -2891,11 +2891,14 @@
                     </div>
                 </div>
                 <div class="buttons">
-                    <button class="btn btn-raised btn-secondary button-create">{{tr "Create new bookmark/directory" /}}</button>
-                    <button class="btn btn-danger button-delete">{{tr "Delete selected bookmark/directory" /}}</button>
+                    <button class="button-large btn btn-raised btn-secondary button-create">{{tr "Create new bookmark/directory" /}}</button>
+                    <button class="button-large btn btn-danger button-delete">{{tr "Delete selected bookmark/directory" /}}</button>
+
+                    <button class="button-small btn btn-raised btn-secondary button-create">{{tr "Create" /}}</button>
+                    <button class="button-small btn btn-danger button-delete">{{tr "Delete" /}}</button>
                 </div>
                 <hr>
-                <div class="group_box">
+                <div class="group_box gb-settings">
                     <div class="header">{{tr "Bookmark settings" /}}</div>
                     <div class="content">
                         <div class="bookmark-setting bookmark-setting-bookmark">
@@ -2925,6 +2928,7 @@
                                     </div>
                                 </div>
                             </div>
+                            <!--
                             <div class="group_box">
                                 <div class="header">{{tr "Connect Properties (Not yet supported)" /}}</div>
                                 <div class="content">
@@ -2942,12 +2946,13 @@
                                         </div>
                                     </div>
                                     <div class="form-group">
-                                        <!-- TODO generated id because of password field (id="bookmark_server_password_{{rnd '0~13377331'/}}") -->
+                                        <!- TODO generated id because of password field (id="bookmark_server_password_{{rnd '0~13377331'/}}") ->
                                         <label for="input-bookmark-channel-password" class="bmd-label-floating">{{tr "Default channel password" /}}</label>
                                         <input id="input-bookmark-channel-password" class="form-control setting-channel-password" type="password" disabled>
                                     </div>
                                 </div>
                             </div>
+                            -->
                         </div>
                         <div class="bookmark-setting bookmark-setting-directory">
                             <div class="form-group">
diff --git a/shared/js/ui/modal/ModalBookmarks.ts b/shared/js/ui/modal/ModalBookmarks.ts
index 2ff9b6cb..97162f92 100644
--- a/shared/js/ui/modal/ModalBookmarks.ts
+++ b/shared/js/ui/modal/ModalBookmarks.ts
@@ -43,7 +43,6 @@ namespace Modals {
             header: tr("Manage bookmarks"),
             body: () => {
                 let template = $("#tmpl_manage_bookmarks").renderTag({ });
-                template = $.spawn("div").append(template);
                 let selected_bookmark: bookmarks.Bookmark | bookmarks.DirectoryBookmark | undefined;
                 let update_name: () => any;