diff --git a/resources/views/invoices/edit_table.blade.php b/resources/views/invoices/edit_table.blade.php
index 54a4b01245b5..232baea250f7 100644
--- a/resources/views/invoices/edit_table.blade.php
+++ b/resources/views/invoices/edit_table.blade.php
@@ -32,7 +32,7 @@
         </td>
         <td>
             <div id="scrollable-dropdown-menu">
-                <input id="product_key" type="text" data-bind="productTypeahead: product_key, items: $root.products, key: 'product_key', valueUpdate: 'afterkeydown', attr: {name: 'invoice_items[{{ $isTasks ? 'T' : '' }}' + $index() + '][product_key]'}" class="form-control invoice-item handled"/>
+                <input type="text" data-bind="productTypeahead: product_key, items: $root.products, key: 'product_key', valueUpdate: 'afterkeydown', attr: {name: 'invoice_items[{{ $isTasks ? 'T' : '' }}' + $index() + '][product_key]'}" class="form-control invoice-item handled"/>
             </div>
         </td>
         <td>
diff --git a/tests/_support/AcceptanceTester.php b/tests/_support/AcceptanceTester.php
index ce3efc36d1ec..0355c9ffeb44 100644
--- a/tests/_support/AcceptanceTester.php
+++ b/tests/_support/AcceptanceTester.php
@@ -114,7 +114,7 @@ class AcceptanceTester extends \Codeception\Actor
         $invoiceNumber = $I->grabValueFrom('#invoice_number');
 
         $I->selectDropdown($I, $clientEmail, '.client_select .dropdown-toggle');
-        $I->fillField('table.invoice-table tbody tr:nth-child(1) #product_key', $productKey);
+        $I->fillField('table.invoice-table tbody tr:nth-child(1) td:nth-child(2) input.tt-input', $productKey);
         $I->click('table.invoice-table tbody tr:nth-child(1) .tt-selectable');
 
         return $invoiceNumber;
diff --git a/tests/acceptance/CheckBalanceCest.php b/tests/acceptance/CheckBalanceCest.php
index b61f2326f06f..e156c9a240eb 100644
--- a/tests/acceptance/CheckBalanceCest.php
+++ b/tests/acceptance/CheckBalanceCest.php
@@ -43,7 +43,7 @@ class CheckBalanceCest
         // create invoice
         $I->amOnPage('/invoices/create');
         $I->selectDropdown($I, $clientEmail, '.client_select .dropdown-toggle');
-        $I->fillField('table.invoice-table tbody tr:nth-child(1) #product_key', $productKey);
+        $I->fillField('table.invoice-table tbody tr:nth-child(1) td:nth-child(2) input.tt-input', $productKey);
         $I->click('table.invoice-table tbody tr:nth-child(1) .tt-selectable');
         $I->click('Mark Sent');
         $I->wait(5);
diff --git a/tests/acceptance/DiscountCest.php b/tests/acceptance/DiscountCest.php
index ffb812e00485..b0027f555f4f 100644
--- a/tests/acceptance/DiscountCest.php
+++ b/tests/acceptance/DiscountCest.php
@@ -62,7 +62,7 @@ class DiscountCest
         // check tax and discount rounding
         $I->selectDropdown($I, $clientEmail, '.client_select .dropdown-toggle');
         $I->fillField('#discount', $discount);
-        $I->fillField('table.invoice-table tbody tr:nth-child(1) #product_key', $productKey);
+        $I->fillField('table.invoice-table tbody tr:nth-child(1) td:nth-child(2) input.tt-input', $productKey);
         $I->click('table.invoice-table tbody tr:nth-child(1) .tt-selectable');
         $I->fillField('table.invoice-table tbody tr:nth-child(1) td:nth-child(6) input', $itemDiscount);
         $I->fillField('table.invoice-table tbody tr:nth-child(1) td:nth-child(5) input', $quantity);
diff --git a/tests/acceptance/InvoiceCest.php b/tests/acceptance/InvoiceCest.php
index 8d9d4b6742ab..a41b3ad5c0fa 100644
--- a/tests/acceptance/InvoiceCest.php
+++ b/tests/acceptance/InvoiceCest.php
@@ -184,7 +184,7 @@ class InvoiceCest
     {
         $row_selector = sprintf('table.invoice-table tbody tr:nth-child(%d) ', $row);
 
-        $I->fillField($row_selector.'#product_key', $product);
+        $I->fillField($row_selector.'td:nth-child(2) input.tt-input', $product);
         $I->fillField($row_selector.'textarea', $description);
         $I->fillField($row_selector.'td:nth-child(4) input', $cost);
         $I->fillField($row_selector.'td:nth-child(5) input', $quantity);
diff --git a/tests/acceptance/OnlinePaymentCest.php b/tests/acceptance/OnlinePaymentCest.php
index 405752a314d4..174c6ddf0b81 100644
--- a/tests/acceptance/OnlinePaymentCest.php
+++ b/tests/acceptance/OnlinePaymentCest.php
@@ -37,7 +37,7 @@ class OnlinePaymentCest
         $I->amOnPage('/invoices/create');
         $invoiceNumber = $I->grabAttributeFrom('#invoice_number', 'value');
         $I->selectDropdown($I, $clientEmail, '.client_select .dropdown-toggle');
-        $I->fillField('table.invoice-table tbody tr:nth-child(1) #product_key', $productKey);
+        $I->fillField('table.invoice-table tbody tr:nth-child(1) td:nth-child(2) input.tt-input', $productKey);
         $I->click('table.invoice-table tbody tr:nth-child(1) .tt-selectable');
         $I->click('Mark Sent');
         $I->see($clientEmail);
@@ -52,7 +52,7 @@ class OnlinePaymentCest
         // create recurring invoice and auto-bill
         $I->amOnPage('/recurring_invoices/create');
         $I->selectDropdown($I, $clientEmail, '.client_select .dropdown-toggle');
-        $I->fillField('table.invoice-table tbody tr:nth-child(1) #product_key', $productKey);
+        $I->fillField('table.invoice-table tbody tr:nth-child(1) td:nth-child(2) input.tt-input', $productKey);
         $I->click('table.invoice-table tbody tr:nth-child(1) .tt-selectable');
         $I->selectOption('#auto_bill', 3);
         $I->executeJS('onConfirmEmailClick()');
diff --git a/tests/acceptance/PaymentCest.php b/tests/acceptance/PaymentCest.php
index d5e3c293b007..3eeb70bc04fc 100644
--- a/tests/acceptance/PaymentCest.php
+++ b/tests/acceptance/PaymentCest.php
@@ -40,7 +40,7 @@ class PaymentCest
         // create invoice
         $I->amOnPage('/invoices/create');
         $I->selectDropdown($I, $clientEmail, '.client_select .dropdown-toggle');
-        $I->fillField('table.invoice-table tbody tr:nth-child(1) #product_key', $productKey);
+        $I->fillField('table.invoice-table tbody tr:nth-child(1) td:nth-child(2) input.tt-input', $productKey);
         $I->click('table.invoice-table tbody tr:nth-child(1) .tt-selectable');
         $I->click('Mark Sent');
         $I->wait(2);
diff --git a/tests/acceptance/QuoteCest.php b/tests/acceptance/QuoteCest.php
index ae227f01a61d..d7923c736b5e 100644
--- a/tests/acceptance/QuoteCest.php
+++ b/tests/acceptance/QuoteCest.php
@@ -41,7 +41,7 @@ class QuoteCest
         // create quote
         $I->amOnPage('/quotes/create');
         $I->selectDropdown($I, $clientEmail, '.client_select .dropdown-toggle');
-        $I->fillField('table.invoice-table tbody tr:nth-child(1) #product_key', $productKey);
+        $I->fillField('table.invoice-table tbody tr:nth-child(1) td:nth-child(2) input.tt-input', $productKey);
         $I->click('table.invoice-table tbody tr:nth-child(1) .tt-selectable');
         $I->click('Mark Sent');
         $I->see($clientEmail);
diff --git a/tests/acceptance/TaxRatesCest.php b/tests/acceptance/TaxRatesCest.php
index fde871422def..074038b0c93f 100644
--- a/tests/acceptance/TaxRatesCest.php
+++ b/tests/acceptance/TaxRatesCest.php
@@ -61,7 +61,7 @@ class TaxRatesCest
         // create invoice
         $I->amOnPage('/invoices/create');
         $I->selectDropdown($I, $clientEmail, '.client_select .dropdown-toggle');
-        $I->fillField('table.invoice-table tbody tr:nth-child(1) #product_key', $productKey);
+        $I->fillField('table.invoice-table tbody tr:nth-child(1) td:nth-child(2) input.tt-input', $productKey);
         $I->click('table.invoice-table tbody tr:nth-child(1) .tt-selectable');
         $I->selectOption('#taxRateSelect1', $invoiceTaxName . ' ' . floatval($invoiceTaxRate) . '%');
         $I->wait(3);
@@ -123,7 +123,7 @@ class TaxRatesCest
        // create invoice
        $I->amOnPage('/invoices/create');
        $I->selectDropdown($I, $clientEmail, '.client_select .dropdown-toggle');
-       $I->fillField('table.invoice-table tbody tr:nth-child(1) #product_key', $productKey);
+       $I->fillField('table.invoice-table tbody tr:nth-child(1) td:nth-child(2) input.tt-input', $productKey);
        $I->click('table.invoice-table tbody tr:nth-child(1) .tt-selectable');
        $I->wait(3);