diff --git a/InvenTree/company/forms.py b/InvenTree/company/forms.py
index a8d833ce13..ccbbea85e6 100644
--- a/InvenTree/company/forms.py
+++ b/InvenTree/company/forms.py
@@ -23,3 +23,12 @@ class EditCompanyForm(HelperForm):
             'is_supplier',
             'notes'
         ]
+
+
+class CompanyImageForm(HelperForm):
+
+    class Meta:
+        model = Company
+        fields = [
+            'image'
+        ]
\ No newline at end of file
diff --git a/InvenTree/company/templates/company/company_base.html b/InvenTree/company/templates/company/company_base.html
index c7fffec1e0..368d7665e9 100644
--- a/InvenTree/company/templates/company/company_base.html
+++ b/InvenTree/company/templates/company/company_base.html
@@ -8,7 +8,7 @@
     <div class="col-sm-6">
         <div class="media">
           <div class="media-left">
-            <img class="part-thumb"
+            <img class="part-thumb" id='company-thumb'
             {% if company.image %}
             src="{{ company.image.url }}"
             {% else %}
@@ -62,4 +62,19 @@
 
 </div>
 
+{% include 'modals.html' %}
+
+{% endblock %}
+
+{% block js_ready %}
+
+    $("#company-thumb").click(function() {
+        launchModalForm("#modal-form",
+                        "{% url 'company-image' company.id %}",
+                        {
+                            reload: true
+                        }
+                        );
+    });
+
 {% endblock %}
\ No newline at end of file
diff --git a/InvenTree/company/templates/company/detail.html b/InvenTree/company/templates/company/detail.html
index b8fb3deea4..70254b1aaf 100644
--- a/InvenTree/company/templates/company/detail.html
+++ b/InvenTree/company/templates/company/detail.html
@@ -29,14 +29,13 @@
 <button class="btn btn-danger" id='delete-company'>Delete Company</button>
 </div>
 
-{% include 'modals.html' %}
-
 {% endblock %}
 
 {% block js_load %}
 <script type='text/javascript' src="{% static 'script/modal_form.js' %}"></script>
 {% endblock %}
 {% block js_ready %}
+{{ block.super }}
     $('#edit-company').click(function() {
         launchModalForm("#modal-form",
                         "{% url 'company-edit' company.id %}",
diff --git a/InvenTree/company/templates/company/detail_part.html b/InvenTree/company/templates/company/detail_part.html
index 71ebd41386..dfd8842132 100644
--- a/InvenTree/company/templates/company/detail_part.html
+++ b/InvenTree/company/templates/company/detail_part.html
@@ -13,8 +13,6 @@
 <button class="btn btn-success" id='part-create'>New Supplier Part</button>
 </div>
 
-{% include 'modals.html' %}
-
 {% endblock %}
 
 {% block js_load %}
@@ -22,6 +20,8 @@
 {% endblock %}
 {% block js_ready %}
 
+{{ block.super }}
+
     $("#part-create").click(function () {
         launchModalForm("#modal-form",
                         "{% url 'supplier-part-create' %}",
diff --git a/InvenTree/company/urls.py b/InvenTree/company/urls.py
index 5defa50568..13c478f28a 100644
--- a/InvenTree/company/urls.py
+++ b/InvenTree/company/urls.py
@@ -12,6 +12,8 @@ company_detail_urls = [
 
     url(r'parts/?', views.CompanyDetail.as_view(template_name='company/detail_part.html'), name='company-detail-parts'),
 
+    url(r'thumbnail/?', views.CompanyImage.as_view(), name='company-image'),
+
     # Any other URL
     url(r'^.*$', views.CompanyDetail.as_view(), name='company-detail'),
 ]
diff --git a/InvenTree/company/views.py b/InvenTree/company/views.py
index bef157af70..9042578baf 100644
--- a/InvenTree/company/views.py
+++ b/InvenTree/company/views.py
@@ -8,6 +8,7 @@ from InvenTree.views import AjaxCreateView, AjaxUpdateView, AjaxDeleteView
 from .models import Company
 
 from .forms import EditCompanyForm
+from .forms import CompanyImageForm
 
 
 class CompanyIndex(ListView):
@@ -35,6 +36,18 @@ class CompanyDetail(DetailView):
     model = Company
 
 
+class CompanyImage(AjaxUpdateView):
+    model = Company
+    ajax_template_name = 'modal_form.html'
+    ajax_form_title = 'Update Company Image'
+    form_class = CompanyImageForm
+
+    def get_data(self):
+        return {
+            'success': 'Updated company image',
+        }
+
+
 class CompanyEdit(AjaxUpdateView):
     model = Company
     form_class = EditCompanyForm