diff --git a/lib/views/home/new_statistic/stock/new_stock.dart b/lib/views/home/new_statistic/stock/new_stock.dart
index 4cc0b50..91f5761 100644
--- a/lib/views/home/new_statistic/stock/new_stock.dart
+++ b/lib/views/home/new_statistic/stock/new_stock.dart
@@ -134,7 +134,9 @@ class _NewStockState extends State<NewStock> {
             emptyState: EmptyResult(
               onNewSearch: () => _focusNode.requestFocus(),
             ),
-            enableEmptyState: context.watch<NewStockState>().contents.isEmpty,
+            enableEmptyState: context.read<NewStockState>().contents.isEmpty &&
+                context.read<NewStockState>().totalContent_type3.isEmpty &&
+                context.read<NewStockState>().totalContent_type4.isEmpty,
             topPadding: 16,
             placeholder: Column(
               children: [
diff --git a/lib/views/profile/edit_profile/edit_profile.dart b/lib/views/profile/edit_profile/edit_profile.dart
index 6117aac..65ae45d 100644
--- a/lib/views/profile/edit_profile/edit_profile.dart
+++ b/lib/views/profile/edit_profile/edit_profile.dart
@@ -147,7 +147,7 @@ class _EditProfileState extends State<EditProfile> {
             Positioned(
               left: 20,
               right: 20,
-              bottom: 20,
+              bottom: MediaQuery.of(context).viewInsets.bottom + 20,
               child: DidvanButton(
                 key: UniqueKey(),
                 title: 'ذخیره تغییرات',