diff --git a/gui/src/app/direct/direct.less b/gui/src/app/direct/direct.less
index e2d109020..dd1dcc823 100644
--- a/gui/src/app/direct/direct.less
+++ b/gui/src/app/direct/direct.less
@@ -209,7 +209,7 @@ p.cert_text {
 
 // Overwritte findertree ul
 .arrowed .finder-tree ul {
-    width: 300px;
+    width: 400px;
     min-width: 100px;
 }
 
diff --git a/gui/src/common/templates/ccdaTemplates/ccdaWidgetTemplate.tpl.html b/gui/src/common/templates/ccdaTemplates/ccdaWidgetTemplate.tpl.html
index f27e92e25..4c4e6108d 100644
--- a/gui/src/common/templates/ccdaTemplates/ccdaWidgetTemplate.tpl.html
+++ b/gui/src/common/templates/ccdaTemplates/ccdaWidgetTemplate.tpl.html
@@ -30,13 +30,14 @@ <h4 class="modal-title">
                     <div ng-dropover ng-dropover-options="{'triggerEvent':'click', 'verticalOffset': 10}">
                         <button class="btn btn-default">Select document...</button>
                         <div ng-dropover-contents class="arrowed">
-                            <form class="form-inline">
-                                <div class="form-group">
-                                    <input type="text" class="form-control" placeholder="Search..." ng-model="ccdaDocSearch" style="margin-bottom: 10px;">
-                                </div>
-                            </form>
-                            <finder-tree data="ccdaData" ng-model="ccdaDocument" search-filter="ccdaDocSearch"></finder-tree>
-                        </div>
+						    <form class="form-inline">
+						        <div class="form-group">
+						            <input type="text" class="form-control" placeholder="Search..." ng-model="ccdaDocSearch" style="margin-bottom: 10px;">
+						        </div>
+						    </form>
+						    <finder-tree data="ccdaData" ng-model="ccdaDocument" search-filter="ccdaDocSearch"></finder-tree>
+						    <button type="submit" class="btn btn-primary dropover-footer-btn" ng-disabled="!ccdaDocument.name" ng-click="save()">{{buttonSuccess}}</button>
+						</div>
                     </div>
                 </div>
                 <div class="col-md-8">