diff --git a/resources/views/partials/label2-preview.blade.php b/resources/views/partials/label2-preview.blade.php
index 36617bcc37..78518f103c 100644
--- a/resources/views/partials/label2-preview.blade.php
+++ b/resources/views/partials/label2-preview.blade.php
@@ -2,7 +2,7 @@
     @push('css')
         <style>
             :root {
-                --l2p-height: 400px;
+                --l2p-height: 200px;
                 --l2p-background-color: aliceblue;
             }
 
diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php
index 6f3694caff..ae8852eaf1 100644
--- a/resources/views/settings/labels.blade.php
+++ b/resources/views/settings/labels.blade.php
@@ -66,10 +66,8 @@
 
                             <!-- Template -->
                             <div class="form-group{{ $errors->has('label2_template') ? ' has-error' : '' }}">
-                                <div class="col-md-3">
-                                    @include('partials.label2-preview')
-                                </div>
-                                <div class="col-md-9">
+
+                                <div class="col-md-9 col-md-offset-3">
                                     <table
                                         data-click-to-select="true"
                                         data-columns="{{ \App\Presenters\LabelPresenter::dataTableLayout() }}"
@@ -92,7 +90,11 @@
                                     ></table>
                                     <script>
                                         document.addEventListener('DOMContentLoaded', () => {
+                                            const chosenLabel = "{{ old('label2_template', $chosenLabel ?? '') }}";
                                             $('#label2TemplateTable').on('load-success.bs.table', (e) => {
+                                                if (chosenLabel) {
+                                                    $('input[name="label2_template"][value="' + chosenLabel + '"]').prop('checked', true);
+                                                }
                                                 let form = document.getElementById('settingsForm');
                                                 form.dispatchEvent(new Event('change'));
                                             });
@@ -209,7 +211,9 @@
                                     <p class="help-block">{{ trans('admin/settings/general.label2_2d_target_help') }}</p>
                                 </div>
                             </div>
-
+                            <div class="col-md-9 col-md-offset-3" style="margin-bottom: 10px;">
+                                @include('partials.label2-preview')
+                            </div>
                             <!-- Fields -->
                             <div class="form-group {{ $errors->has('label2_fields') ? 'error' : '' }}">
                                 <div class="col-md-3 text-right">