diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.css
index 276410415c..31c1d39714 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.css
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.css
@@ -63,7 +63,7 @@
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
-    width: 80%;
+    width: calc(100% - 15px);
     font-weight: normal;
 }
 
@@ -89,6 +89,7 @@ div.selected-disabled-option {
     height: 32px;
     font-weight: normal;
     line-height: 32px;
+    width: calc(100% - 15px);
 }
 
 .combo-glass-pane {
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.js
index a8eec19f49..009f2067c4 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.js
@@ -161,8 +161,8 @@
                         var comboOptions = $('<div></div>').addClass('combo-options').css({
                             'position': 'absolute',
                             'left': position.left + 'px',
-                            'top': (position.top + combo.outerHeight() - 1) + 'px',
-                            'width': (combo.outerWidth() - 2) + 'px',
+                            'top': (position.top + Math.round(combo.outerHeight()) - 1) + 'px',
+                            'width': (Math.round(combo.outerWidth()) - 2) + 'px',
                             'overflow-y': 'auto'
                         });
 
@@ -235,6 +235,8 @@
                                         }
                                     }
                                 );
+                            } else {
+                                optionText.css('width', '100%');
                             }
 
                             actualHeight += 16;