diff --git a/app/Resources/public/css/dialog.css b/app/Resources/public/css/dialog.css
new file mode 100644
index 0000000000..6dd2991eea
--- /dev/null
+++ b/app/Resources/public/css/dialog.css
@@ -0,0 +1,25 @@
+.ui-dialog .ui-dialog-content{
+    font-size: 12px;
+    line-height: 22px;
+}
+.ui-draggable .ui-dialog-titlebar {
+    cursor: move;
+    background: #e5e5e5;
+    border: none;
+    padding: 2px 10px;
+}
+.ui-dialog .ui-dialog-title{
+    margin: 0;
+    font-size: 14px;
+    padding-left: 8px;
+}
+.ui-dialog{
+    padding: 0;
+}
+.ui-widget-content {
+    border: 1px solid #ddd;
+}
+.ui-dialog .ui-dialog-titlebar {
+    padding: 0 5px;
+    position: relative;
+}
\ No newline at end of file
diff --git a/main/inc/lib/display.lib.php b/main/inc/lib/display.lib.php
index c389d60297..e38325be3d 100755
--- a/main/inc/lib/display.lib.php
+++ b/main/inc/lib/display.lib.php
@@ -2858,6 +2858,7 @@ HTML;
                 { type:"stylesheet", id:"_fr5", src:"'.api_get_path(WEB_PUBLIC_PATH).'assets/jquery-ui/themes/smoothness/jquery-ui.min.css"},
                 { type:"stylesheet", id:"_fr6", src:"'.api_get_path(WEB_PUBLIC_PATH).'assets/jquery-ui/themes/smoothness/theme.css"},
                 { type:"script", id:"_fr2", src:"'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.highlight.js"},
+                { type:"stylesheet", id:"_fr7", src:"'.api_get_path(WEB_PUBLIC_PATH).'css/dialog.css"},
                 { type:"script", id:"_fr3", src:"'.api_get_path(WEB_CODE_PATH).'glossary/glossary.js.php?'.api_get_cidreq().'"},
                 {type: "script", id: "_media1", src: "'.api_get_path(WEB_PUBLIC_PATH).'assets/mediaelement/build/mediaelement-and-player.min.js"},
                 {type: "stylesheet", id: "_media2", src: "'.api_get_path(WEB_PUBLIC_PATH).'assets/mediaelement/build/mediaelementplayer.min.css"},                
diff --git a/main/template/default/glossary/glossary_manual.js.tpl b/main/template/default/glossary/glossary_manual.js.tpl
index 97b1f42af3..ab4d13d7e9 100644
--- a/main/template/default/glossary/glossary_manual.js.tpl
+++ b/main/template/default/glossary/glossary_manual.js.tpl
@@ -11,15 +11,17 @@ $(document).ready(function() {
         div_show_id = "div_show_id";
         div_content_id = "div_content_id";
 
-        $(this).append("<div id="+div_show_id+" ><div id="+div_content_id+">&nbsp;</div></div>");
-
         var $target = $(this);
+        var title = $target.text();
+
+        $(this).append("<div id="+div_show_id+" title="+title+" ><div id="+div_content_id+">&nbsp;</div></div>");
+
 
         //$("#"+div_show_id).dialog("destroy");
         $("#"+div_show_id).dialog({
             autoOpen: false,
-            width: 600,
-            height: 200,
+            width: 500,
+            height: 'auto',
             position:  { my: 'left top', at: 'right top', of: $target },
             close: function(){
                 $("div#"+div_show_id).remove();
diff --git a/main/template/default/layout/modals.tpl b/main/template/default/layout/modals.tpl
index 17f5405d35..de64d41b3c 100644
--- a/main/template/default/layout/modals.tpl
+++ b/main/template/default/layout/modals.tpl
@@ -8,7 +8,7 @@
                 </button>
                 <h4 class="modal-title" id="global-modal-title">&nbsp;</h4>
             </div>
-            <div class="modal-body">
+            <div class="modal-body" id="global-modal-body">
             </div>
         </div>
     </div>