diff --git a/src/octoprint/plugins/svgtogcode/static/css/mrbeam.css b/src/octoprint/plugins/svgtogcode/static/css/mrbeam.css
index 7d028bab..3b62b4e5 100644
--- a/src/octoprint/plugins/svgtogcode/static/css/mrbeam.css
+++ b/src/octoprint/plugins/svgtogcode/static/css/mrbeam.css
@@ -1624,6 +1624,14 @@ input.search-query,
 }
 */
 
+.file_list_entry {
+	margin-right: 0.5em;
+}
+.file_list_entry .title {
+	width: 90%;
+	float: left;
+}
+
 #files .file_list_entry .title {
 	margin-left: 3.3em;
 }
@@ -1699,6 +1707,14 @@ input.search-query,
   height: 30px;
 }
 
+#working_area_files {
+  height: 60vh;
+}
+
+#wa_filelist {
+	height: 55vh;
+}
+
 .print-control {
 	margin-top: 8px;
 }
diff --git a/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2 b/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2
index 377fbbc4..51329d19 100644
--- a/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2
+++ b/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2
@@ -183,7 +183,7 @@
 
 												<script type="text/html" id="wa_template_machinecode">
 													<div class="file_list_entry">
-														<span class="title muted" data-bind="text: name" style="color:#ADADAD;"></span>
+														<div class="title muted" data-bind="text: name" style="color:#ADADAD;"></div>
 														<div class="btn-group action-buttons pull-right">
 															<div class="btn btn-mini" data-bind="click: function(){ $root.removeGcode($data); }"><i class="icon-remove" title="{{ _('Remove') }}"></i></div>
 														</div>
@@ -192,7 +192,7 @@
 
 												<script type="text/html" id="wa_template_model_svg">
 													<div class="file_list_entry">
-														<span class="title muted" data-bind="text: name"></span>
+														<div class="title muted" data-bind="text: name"></div>
 														<div class="btn-group action-buttons pull-right">
 															<div class="btn btn-mini" data-bind="click: function() { $root.removeSVG($data); }"><i class="icon-remove" title="{{ _('Remove') }}"></i></div>
 														</div>