diff --git a/app/Http/Controllers/VendorController.php b/app/Http/Controllers/VendorController.php
index effda8c55283..bc16ee9e407c 100644
--- a/app/Http/Controllers/VendorController.php
+++ b/app/Http/Controllers/VendorController.php
@@ -82,7 +82,6 @@ class VendorController extends BaseController
             'actionLinks'           => $actionLinks,
             'showBreadcrumbs'       => false,
             'vendor'                => $vendor,
-            'totalexpense'          => $vendor->getTotalExpense(),
             'title'                 => trans('texts.view_vendor'),
             'hasRecurringInvoices'  => false,
             'hasQuotes'             => false,
diff --git a/app/Models/Vendor.php b/app/Models/Vendor.php
index a68cf42e2ff3..addf98e1d1ec 100644
--- a/app/Models/Vendor.php
+++ b/app/Models/Vendor.php
@@ -321,12 +321,14 @@ class Vendor extends EntityModel
     /**
      * @return float|int
      */
-    public function getTotalExpense()
+    public function getTotalExpenses()
     {
         return DB::table('expenses')
-                ->where('vendor_id', '=', $this->id)
-                ->whereNull('deleted_at')
-                ->sum('amount');
+                ->select('expense_currency_id', DB::raw('SUM(amount) as amount'))
+                ->whereVendorId($this->id)
+                ->whereIsDeleted(false)
+                ->groupBy('expense_currency_id')
+                ->get();
     }
 }
 
diff --git a/resources/views/list.blade.php b/resources/views/list.blade.php
index b320690752c3..4b1f94021194 100644
--- a/resources/views/list.blade.php
+++ b/resources/views/list.blade.php
@@ -55,7 +55,7 @@
 		{!! Button::normal(trans('texts.projects'))->asLinkTo(URL::to('/projects'))->appendIcon(Icon::create('list')) !!}
     @endif
 
-	@if (Auth::user()->can('create', $entityType))
+	@if (Auth::user()->can('create', $entityType) && empty($vendorId))
     	{!! Button::primary(mtrans($entityType, "new_{$entityType}"))->asLinkTo(url(Utils::pluralizeEntityType($entityType) . '/create/' . (isset($clientId) ? $clientId : '')))->appendIcon(Icon::create('plus-sign')) !!}
 	@endif
 
diff --git a/resources/views/vendors/show.blade.php b/resources/views/vendors/show.blade.php
index 649691d53958..8ba8258477d3 100644
--- a/resources/views/vendors/show.blade.php
+++ b/resources/views/vendors/show.blade.php
@@ -153,8 +153,12 @@
 			<h3>{{ trans('texts.standing') }}
 			<table class="table" style="width:100%">
 				<tr>
-					<td><small>{{ trans('texts.balance') }}</small></td>
-					<td style="text-align: right">{{ Utils::formatMoney($totalexpense, $vendor->getCurrencyId()) }}</td>
+					<td style="vertical-align: top"><small>{{ trans('texts.balance') }}</small></td>
+                    <td style="text-align: right">
+                        @foreach ($vendor->getTotalExpenses() as $currency)
+                            <p>{{ Utils::formatMoney($currency->amount, $currency->expense_currency_id) }}</p>
+                        @endforeach
+                    </td>
 				</tr>
 			</table>
 			</h3>